rendered paste body[root@localhost Deki-mindtouch]# git diff web/skins/beech/cedar/css/style.cssdiff --cc web/skins/beech/cedar/css/style.cssindex f6ce545,37c65aa..0000000--- a/web/skins/beech/cedar/css/style.css+++ b/web/skins/beech/cedar/css/style.css@@@ -197,19 -198,12 +197,22 @@@ body.deki-content-edit p.comment .user-nav form { float:right; display:none;++<<<<<<< HEAD + margin-top:3px;++=======++>>>>>>> origin/master } .user-nav form input { - width:80px; + width:90px; + height: 18px; padding:3px; border:1px solid #ccc; - -moz-border-radius:5px; + -moz-border-radius:3px; + -webkit-border-radius:3px; + border-radius:3px; +} +.user-nav form .title.login-form-label { + display: none; } .user-nav form .col { float:left;@@@ -220,36 -214,12 +223,41 @@@ font-size:10px; color:#666; }++<<<<<<< HEAD +.user-nav form .col-btn { + margin-right: 0;++=======+ .user-nav form .title.login-form-label {+ display: none;++>>>>>>> origin/master } .user-nav form input.btn { + background-image: linear-gradient(bottom, rgb(0,102,0) 25%, rgb(0,204,0) 100%); + background-image: -o-linear-gradient(bottom, rgb(0,102,0) 25%, rgb(0,204,0) 100%); + background-image: -moz-linear-gradient(bottom, rgb(0,102,0) 25%, rgb(0,204,0) 100%); + background-image: -webkit-linear-gradient(bottom, rgb(0,102,0) 25%, rgb(0,204,0) 100%); + background-image: -ms-linear-gradient(bottom, rgb(0,102,0) 25%, rgb(0,204,0) 100%); + background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.25, rgb(0,102,0)), + color-stop(1, rgb(0,204,0)) + ); + border:1px solid #006600; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + color:#fff; + height: 26px; + margin: 0; + padding: 3px 8px; + text-shadow:none; width:auto; } +.user-nav form input.btn:hover { + color: #ccc; +} /* pro member */ .pro-member { background:#494949 url(images/pro-member-bg.jpg) repeat-x 0 0;