commit/galaxy-central: guerler: Ui: Fix slider and option styles
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f89efbcfd102/ Changeset: f89efbcfd102 User: guerler Date: 2014-09-22 21:11:09+00:00 Summary: Ui: Fix slider and option styles Affected #: 2 files diff -r 5636e8ac71d5955501e333dc6fa4693cc5905c1c -r f89efbcfd102b4aab4ffe29285348e3ee6a02cca static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -148,7 +148,7 @@ .form-control::-moz-placeholder{color:#999} .form-control:-ms-input-placeholder{color:#999} .form-control::-webkit-input-placeholder{color:#999} -.form-control,.ui-options,.ui-form-slider .ui-form-slider-text,.ui-input,.ui-textarea{display:block;width:100%;height:27px;padding:4px 10px;font-size:12px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #aaa;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)} +.form-control,.ui-input,.ui-textarea,.ui-options,.ui-form-slider .ui-form-slider-text,.ui-select-multiple{display:block;width:100%;height:27px;padding:4px 10px;font-size:12px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #aaa;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)} .form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee} textarea.form-control{height:auto} .form-group{margin-bottom:15px} @@ -1279,12 +1279,7 @@ .upload-settings .upload-settings-cover{position:absolute;width:100%;height:100%;top:0px;left:0px;background:#fff;opacity:0.4;cursor:no-drop} .no-highlight,.ui-button-icon,.ui-portlet,.ui-portlet-repeat{-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;-ms-user-select:none;} .ui-error{-moz-border-radius:3px;border-radius:3px;background:#f9c7c5;padding:5px} -.ui-options{height:100% !important} .ui-table-form-error{display:none}.ui-table-form-error .ui-table-form-error-text{padding-left:5px} -.ui-form-slider .ui-form-slider-text{width:100px;float:left} -.ui-form-slider .ui-form-slider-element{width:calc(100% - 110px);float:left;top:8px;left:10px} -.ui-radiobutton{width:100%}.ui-radiobutton label{height:23px;line-height:1em} -.ui-radiobutton i{padding-right:5px} .ui-table tbody{cursor:pointer} .ui-table-plain tbody td{padding:5px 0px 5px 0px !important;border:none !important} .ui-table-plain tbody{cursor:auto !important} @@ -1299,7 +1294,6 @@ .ui-button-icon .button{margin-right:5px;margin-left:5px}.ui-button-icon .button .title{position:relative;font-size:0.8em;font-weight:normal;top:-1px} .ui-button-icon .button.disabled{filter:alpha(opacity=65);opacity:.65;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=65);filter:alpha(opacity=65)} .ui-button-icon-plain{border:none !important;background:none !important} -.ui-textarea{height:100px !important} .ui-tabs .ui-tabs-add{font-size:0.8em;margin-right:5px} .ui-tabs .ui-tabs-delete{font-size:0.8em;margin-left:5px;cursor:pointer} .ui-portlet,.ui-portlet-repeat,.ui-portlet-repeat{border:solid #d6b161 1px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;position:relative;clear:both;width:auto;height:100%}.ui-portlet .portlet-header{background:#ebd9b2;border-bottom:solid #d6b161 1px;padding:2px 8px;overflow:visible;float:right;width:100%}.ui-portlet .portlet-header h1,.ui-portlet .portlet-header h2,.ui-portlet .portlet-header h3,.ui-portlet .portlet-header h4,.ui-portlet .portlet-header h5,.ui-portlet .portlet-header h6{float:left;font-weight:normal;display:inline-block;vertical-align:middle;font-size:1em;margin:3px}.ui-portlet .portlet-header h1 .icon,.ui-portlet .portlet-header h2 .icon,.ui-portlet .portlet-header h3 .icon,.ui-portlet .portlet-header h4 .icon,.ui-portlet .portlet-header h5 .icon,.ui-portlet .portlet-header h6 .icon{font-size:1.2em} @@ -1311,7 +1305,14 @@ .ui-portlet-repeat .portlet-content{padding:0px}.ui-portlet-repeat .portlet-content .content{padding:0px;padding-left:10px} .ui-popover{max-width:700px;display:none}.ui-popover .popover-close{position:absolute;right:10px;top:7px;font-size:1.2em;cursor:pointer} .ui-popover .popover-title{padding:4px 10px} -.ui-select,.ui-select-multiple{position:relative;height:27px;overflow:hidden;border:1px solid #bfbfbf;-moz-border-radius:3px;border-radius:3px}.ui-select .button{position:relative;width:25px;height:100%;float:right;border-left:1px solid #bfbfbf;padding-left:9px;padding-top:4px;background:#f2f2f2} +.ui-input,.ui-textarea,.ui-options,.ui-form-slider .ui-form-slider-text,.ui-select-multiple,.ui-textarea,.ui-options,.ui-form-slider .ui-form-slider-text,.ui-select-multiple{background:transparent} +.ui-textarea{height:100px !important} +.ui-options{height:100% !important} +.ui-form-slider{display:inline-block;width:100%}.ui-form-slider .ui-form-slider-text{width:100px;float:left} +.ui-form-slider .ui-form-slider-element{width:calc(100% - 110px);float:left;top:8px;left:10px} +.ui-radiobutton{width:100%}.ui-radiobutton label{height:23px;line-height:1em} +.ui-radiobutton i{padding-right:5px} +.ui-select{position:relative;height:27px;overflow:hidden;border:1px solid #bfbfbf;-moz-border-radius:3px;border-radius:3px}.ui-select .button{position:relative;width:25px;height:100%;float:right;border-left:1px solid #bfbfbf;padding-left:9px;padding-top:4px;background:#f2f2f2} .ui-select select{position:absolute;top:0px;height:100%;width:100%;padding-left:5px;cursor:pointer;background:transparent;border:0;border-radius:0;-webkit-appearance:none} .ui-select-multiple{height:100% !important;width:100% !important} .libraryRow{background-color:#ebd9b2} diff -r 5636e8ac71d5955501e333dc6fa4693cc5905c1c -r f89efbcfd102b4aab4ffe29285348e3ee6a02cca static/style/src/less/ui.less --- a/static/style/src/less/ui.less +++ b/static/style/src/less/ui.less @@ -12,11 +12,6 @@ padding: 5px; } -.ui-options { - &:extend(.form-control); - height: 100% !important; -} - .ui-table-form-error { display: none; .ui-table-form-error-text { @@ -24,33 +19,6 @@ } } -.ui-form-slider { - .ui-form-slider-text { - &:extend(.form-control); - width: 100px; - float: left; - } - - .ui-form-slider-element { - width: ~'calc(100% - 110px)'; - float: left; - top: 8px; - left: 10px; - } -} - -.ui-radiobutton { - width: 100%; - label { - height: 23px; - line-height: 1em; - } - - i { - padding-right: 5px; - } -} - .ui-table { &:extend(.grid); @@ -143,15 +111,6 @@ background: none !important; } -.ui-input { - &:extend(.form-control); -} - -.ui-textarea { - &:extend(.form-control); - height: 100px !important; -} - .ui-tabs { .ui-tabs-add { font-size : 0.8em; @@ -266,6 +225,51 @@ } } +.ui-input { + &:extend(.form-control); + background: transparent; +} + +.ui-textarea { + &:extend(.ui-input); + height: 100px !important; +} + +.ui-options { + &:extend(.ui-input); + height: 100% !important; +} + + +.ui-form-slider { + display: inline-block; + width: 100%; + .ui-form-slider-text { + &:extend(.ui-input); + width: 100px; + float: left; + } + + .ui-form-slider-element { + width: ~'calc(100% - 110px)'; + float: left; + top: 8px; + left: 10px; + } +} + +.ui-radiobutton { + width: 100%; + label { + height: 23px; + line-height: 1em; + } + + i { + padding-right: 5px; + } +} + .ui-select { position: relative; height: 27px; @@ -300,7 +304,7 @@ } .ui-select-multiple { - &:extend(.ui-select); + &:extend(.ui-input); height: 100% !important; width: 100% !important; } \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org