diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-03 18:05:07 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-03 18:05:07 +0000 |
commit | 8bb57e70cd0e8aa76f8c0a44f2a37c4dab88ec82 (patch) | |
tree | d436af1adf30541f1c79055350500c15bd9a6419 /app/assets | |
parent | 12af657728cc3a7c614bdefea1f46ebbe71ea875 (diff) | |
parent | ccb20c1622b30eeec5951bbe6431a3df53dfe7ed (diff) | |
download | gitlab-ce-8bb57e70cd0e8aa76f8c0a44f2a37c4dab88ec82.tar.gz |
Merge branch 'remove-unnecessary-prefixes' into 'master'
Remove unnecessary vendor prefixes for browsers we no longer support.
Pretty simple, just removes a few prefixed properties for browsers we don't support.
See merge request !4368
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/search.scss | 2 |
3 files changed, 1 insertions, 16 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 250d6309291..828e7224231 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -2,18 +2,10 @@ * Generic mixins */ @mixin box-shadow($shadow) { - -webkit-box-shadow: $shadow; - -moz-box-shadow: $shadow; - -ms-box-shadow: $shadow; - -o-box-shadow: $shadow; box-shadow: $shadow; } @mixin border-radius($radius) { - -webkit-border-radius: $radius; - -moz-border-radius: $radius; - -ms-border-radius: $radius; - -o-border-radius: $radius; border-radius: $radius; } diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index aa41565f812..44222e8e8a4 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -3,12 +3,7 @@ background: #111; color: #fff; font-family: $monospace_font; - white-space: pre; - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ + white-space: pre-wrap; overflow: auto; overflow-y: hidden; font-size: 12px; diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 037ad520545..ae524cd6bae 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -158,13 +158,11 @@ .search-holder { @media (min-width: $screen-sm-min) { display: -webkit-flex; - display: -ms-flexbox; display: flex; } .search-field-holder { -webkit-flex: 1 0 auto; - -ms-flex: 1 0 auto; flex: 1 0 auto; position: relative; margin-right: 0; |