From 270e4e7e74c22fcce3f1852857fdbe7d2ff2bf63 Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Mon, 19 Sep 2011 05:22:46 +0000 Subject: [PATCH] .btn .button class UI fix. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9190 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/css/xe.css | 24 ++++++++++++++++++++++++ common/css/xe.min.css | 24 ++++++++++++++++++++++++ modules/admin/tpl/css/admin.css | 14 -------------- modules/admin/tpl/css/admin.min.css | 14 -------------- 4 files changed, 48 insertions(+), 28 deletions(-) diff --git a/common/css/xe.css b/common/css/xe.css index ee260d286..1b0c9a2cd 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -1,5 +1,29 @@ @charset "utf-8"; /* NHN (developers@xpressengine.com) */ +/* Button */ +.btn{position:relative;display:inline-block;vertical-align:top} +.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} +.btn *[type=submit][disabled=disabled], +.btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} +.btn a, +.btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} +.btn input, +.btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} +.btn a{height:22px} +.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px} +.btn.medium a{height:28px} +.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px} +.btn.large a{height:34px} +/* Button - Regucy */ +.button{position:relative;display:inline-block;vertical-align:top} +.button *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} +.button *[type=submit][disabled=disabled], +.button *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} +.button span, +.button button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} +.button input, +.button button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} +.button span{height:22px} /* Popup Menu Area */ #popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} #popup_menu_area ul{list-style:none;margin:0;padding:0} diff --git a/common/css/xe.min.css b/common/css/xe.min.css index ee260d286..1b0c9a2cd 100644 --- a/common/css/xe.min.css +++ b/common/css/xe.min.css @@ -1,5 +1,29 @@ @charset "utf-8"; /* NHN (developers@xpressengine.com) */ +/* Button */ +.btn{position:relative;display:inline-block;vertical-align:top} +.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} +.btn *[type=submit][disabled=disabled], +.btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} +.btn a, +.btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} +.btn input, +.btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} +.btn a{height:22px} +.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px} +.btn.medium a{height:28px} +.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px} +.btn.large a{height:34px} +/* Button - Regucy */ +.button{position:relative;display:inline-block;vertical-align:top} +.button *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} +.button *[type=submit][disabled=disabled], +.button *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} +.button span, +.button button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} +.button input, +.button button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} +.button span{height:22px} /* Popup Menu Area */ #popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} #popup_menu_area ul{list-style:none;margin:0;padding:0} diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index ef79be6a2..0b0f149b2 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -186,20 +186,6 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di .x .pagination .direction:focus{border:0;margin:0;text-decoration:underline} .x .pagination input{width:30px;text-align:center} .x .pagination button{overflow:visible} -/* Button */ -.x .btn{position:relative;display:inline-block;margin:2px;vertical-align:top} -.x .btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} -.x .btn *[type=submit][disabled=disabled], -.x .btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} -.x .btn a, -.x .btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} -.x .btn input, -.x .btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} -.x .btn a{height:22px} -.x .btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px} -.x .btn.medium a{height:28px} -.x .btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px} -.x .btn.large a{height:34px} /* Star Rating */ .x .starRating, .x .starRating span{display:inline-block;height:14px;background:transparent url(../img/iconStarRating.gif) no-repeat;overflow:hidden} diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index aa7b7b309..2db3066c5 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -187,20 +187,6 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di .x .pagination .direction:focus{border:0;margin:0;text-decoration:underline} .x .pagination input{width:30px;text-align:center} .x .pagination button{overflow:visible} -/* Button */ -.x .btn{position:relative;display:inline-block;margin:2px;vertical-align:top} -.x .btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1} -.x .btn *[type=submit][disabled=disabled], -.x .btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)} -.x .btn a, -.x .btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)} -.x .btn input, -.x .btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)} -.x .btn a{height:22px} -.x .btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px} -.x .btn.medium a{height:28px} -.x .btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px} -.x .btn.large a{height:34px} /* Star Rating */ .x .starRating, .x .starRating span{display:inline-block;height:14px;background:transparent url(../img/iconStarRating.gif) no-repeat;overflow:hidden}