diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 03b69ab5b13..9dab1ac1337 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -554,7 +554,6 @@ body { .input-prepend input, .input-append input, .input-prepend select, .input-append select { position: relative; margin-bottom: 0; - *margin-left: 0; vertical-align: middle; border-radius: 0 3px 3px 0; } @@ -614,7 +613,6 @@ body { .form-horizontal input, .form-horizontal textarea, .form-horizontal select, .form-horizontal .input-prepend, .form-horizontal .input-append { display: inline-block; - *display: inline; margin-bottom: 0; } .form-horizontal .hide { @@ -627,7 +625,6 @@ body { .form-horizontal { .control-group { margin-bottom: 18px; - *zoom: 1; &:before { display: table; content: ""; @@ -650,13 +647,7 @@ body { font-weight: bold; } .controls { - *display: inline-block; - *padding-left: 20px; margin-left: 160px; - *margin-left: 0; - &:first-child { - *padding-left: 160px; - } } } @@ -724,9 +715,6 @@ body { /* bootstrap colums */ -.row { - *zoom: 1; -} .row:before, .row:after { display: table; diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 44831bd4f6b..285d2a911ec 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -7,9 +7,6 @@ .dropdown-menu { z-index: 2050; } - .dropdown.open { - *z-index: 2050; - } .popover { z-index: 2060; } @@ -53,8 +50,6 @@ background-color: $primary_background_color; border: 1px solid $primary_border_color; border: 1px solid lighten($primary_border_color, 10%); - *border: 1px solid $primary_border_color; - /* IE6-7 */ box-shadow: 0 3px 7px rgba($primary_shadow_color, .8); background-clip: padding-box; @@ -79,10 +74,8 @@ height: auto; margin: -250px 0 0 -305px; background-color: $primary_background_color; -border: 1px solid $primary_border_color; + border: 1px solid $primary_border_color; border: 1px solid lighten($primary_border_color, 10%); - *border: 1px solid $primary_border_color; - /* IE6-7 */ box-shadow: 0 3px 7px rgba($primary_shadow_color, .8); background-clip: padding-box; @@ -108,7 +101,6 @@ border: 1px solid $primary_border_color; margin: 0 15px; padding: 14px 0 15px; border-top: 1px solid $primary_border_color; - *zoom: 1; } .modal-footer:before, .modal-footer:after { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 68e385f03bd..ec2be4b2250 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -849,9 +849,6 @@ button.show-replies { .dropdown { position: relative; } -.dropdown-toggle { - *margin-bottom: -3px; -} .caret { display: inline-block; width: 0; @@ -896,9 +893,6 @@ button.show-replies { text-decoration: none; background-color: $emphasis_text_color; } -.open { - *z-index: 1000; -} .open > .dropdown-menu { display: block; clear: both; diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 53fb4fae11d..d6e81348188 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -7,9 +7,6 @@ .dropdown-menu { z-index: 2050; } - .dropdown.open { - *z-index: 2050; - } .popover { z-index: 2060; } @@ -48,7 +45,7 @@ } .modal-middle-container { margin-top: 10%; - max-width: 100%; + max-width: 100%; } .modal-inner-container { @@ -57,8 +54,6 @@ background-color: $primary_background_color; border: 1px solid $primary_border_color; border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid $primary_border_color; - /* IE6-7 */ @include border-radius-all (6px); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -87,8 +82,6 @@ background-color: $primary_background_color; border: 1px solid $primary_border_color; border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid $primary_border_color; - /* IE6-7 */ @include border-radius-all (6px); box-shadow: 0 3px 7px rgba($primary_shadow_color, 0.3); @@ -117,7 +110,6 @@ border-top: 1px solid #ddd; @include border-radius-all(0 0 6px 6px); @include box-shadow (inset 0 1px 0 rgba($primary_shadow_color, .8)); - *zoom: 1; } .modal-footer:before, .modal-footer:after { diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 9562206b283..0cc735724e7 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -358,9 +358,6 @@ span.posted { .dropdown { position: relative; } -.dropdown-toggle { - *margin-bottom: -3px; -} .dropdown-toggle:active, .open .dropdown-toggle { outline: 0; @@ -390,8 +387,6 @@ span.posted { background-color: $primary_background_color; border: 1px solid $primary_border_color; border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; border-radius: 5px; box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); background-clip: padding-box; @@ -414,12 +409,9 @@ span.posted { text-decoration: none; background-color: $emphasis_text_color; } -.open { - *z-index: 1000; -} .open > .dropdown-menu { display: block; -clear: both; + clear: both; } .fade { opacity: 0; diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss index 02eb1bb4bb0..925c58edfa3 100644 --- a/app/assets/stylesheets/vendor/bootstrap.scss +++ b/app/assets/stylesheets/vendor/bootstrap.scss @@ -24,7 +24,6 @@ img { } .row { margin-left: -12px; - *zoom: 1; } .row:before, .row:after { @@ -118,9 +117,6 @@ input[type="submit"].btn::-moz-focus-inner { .dropdown { position: relative; } -.dropdown-toggle { - *margin-bottom: -3px; -} .dropdown-toggle:active, .open .dropdown-toggle { outline: 0; @@ -149,8 +145,6 @@ input[type="submit"].btn::-moz-focus-inner { background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; border-radius: 5px; box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); background-clip: padding-box; @@ -171,9 +165,6 @@ input[type="submit"].btn::-moz-focus-inner { text-decoration: none; background-color: #0088cc; } -.open { - *z-index: 1000; -} .open > .dropdown-menu { display: block; } @@ -475,7 +466,6 @@ body { .input-prepend input, .input-append input, .input-prepend select, .input-append select { position: relative; margin-bottom: 0; - *margin-left: 0; vertical-align: middle; border-radius: 0 3px 3px 0; } @@ -536,7 +526,6 @@ body { .form-horizontal input, .form-horizontal textarea, .form-horizontal select, .form-horizontal .input-prepend, .form-horizontal .input-append { display: inline-block; - *display: inline; margin-bottom: 0; } .form-horizontal .hide { @@ -549,7 +538,6 @@ body { .form-horizontal { .control-group { margin-bottom: 18px; - *zoom: 1; &:before { display: table; content: ""; @@ -572,13 +560,7 @@ body { font-weight: bold; } .controls { - *display: inline-block; - *padding-left: 20px; margin-left: 160px; - *margin-left: 0; - &:first-child { - *padding-left: 160px; - } } } diff --git a/app/assets/stylesheets/vendor/chosen.css.erb b/app/assets/stylesheets/vendor/chosen.css.erb index d66e8b44d57..f1102416a15 100644 --- a/app/assets/stylesheets/vendor/chosen.css.erb +++ b/app/assets/stylesheets/vendor/chosen.css.erb @@ -8,7 +8,6 @@ position: relative; display: inline-block; zoom: 1; - *display: inline; } .chzn-container .chzn-drop { background: #fff;