diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less --- a/rhodecode/public/css/code-block.less +++ b/rhodecode/public/css/code-block.less @@ -213,12 +213,12 @@ div.diffblock { table.code-difftable { border-collapse: collapse; width: 99%; - border-radius: 0px !important; + border-radius: 0px; td { - padding: 0 !important; - background: none !important; - border: 0 !important; + padding: 0; + background: none; + border: 0; } .context { @@ -245,16 +245,16 @@ table.code-difftable { /** LINE NUMBERS **/ .lineno { - padding-left: 2px !important; + padding-left: 2px; padding-right: 2px; text-align: right; width: 32px; -moz-user-select: none; -webkit-user-select: none; - border-right: @border-thickness solid @grey5 !important; - border-left: 0px solid #CCC !important; - border-top: 0px solid #CCC !important; - border-bottom: none !important; + border-right: @border-thickness solid @grey5; + border-left: 0px solid #CCC; + border-top: 0px solid #CCC; + border-bottom: none; a { &:extend(pre); @@ -272,7 +272,7 @@ table.code-difftable { } .lineno-inline { - background: none repeat scroll 0 0 #FFF !important; + background: none repeat scroll 0 0 #FFF; padding-left: 2px; padding-right: 2px; text-align: right; @@ -303,7 +303,7 @@ table.code-difftable { // Comments div.comment:target { - border-left: 6px solid @comment-highlight-color !important; + border-left: 6px solid @comment-highlight-color; padding-left: 3px; margin-left: -9px; } @@ -540,7 +540,7 @@ div.search-code-body { padding-left: 10px; } td.line { - border-right: 1px solid #ccc !important; + border-right: 1px solid #ccc; padding-right: 10px; text-align: right; font-family: "Lucida Console",Monaco,monospace; @@ -556,7 +556,7 @@ div.annotatediv { margin-left: 2px; marg .code-highlight { margin: 0; padding: 0; border-left: @border-thickness solid @grey5; pre, .linenodiv pre { padding: 0 5px; margin: 0; } - pre div:target {background-color: @comment-highlight-color !important;} + pre div:target {background-color: @comment-highlight-color;} } .linenos a { text-decoration: none; } @@ -566,7 +566,7 @@ div.annotatediv { margin-left: 2px; marg .CodeMirror ::selection { background: @rchighlightblue; } .CodeMirror ::-moz-selection { background: @rchighlightblue; } -.code { display: block; border:0px !important; } +.code { display: block; border:0px; } .code-highlight, /* TODO: dan: merge codehilite into code-highlight */ .codehilite { .hll { background-color: #ffffcc } @@ -720,7 +720,7 @@ input.filediff-collapse-state { } &.diffset-comments-disabled { .cb-comment-box-opener, .comment-inline-form, .cb-comment-add-button { - display: none !important; + display: none; } } } @@ -801,7 +801,7 @@ input.filediff-collapse-state { clear: both; } .filediff-heading:hover { - background: #e1e9f4 !important; + background: #e1e9f4; } .filediff-menu { @@ -953,11 +953,11 @@ table.cb { } /* intentionally general selector since .cb-line-selected must override it - and they both use !important since the td itself may have a random color + and they both use since the td itself may have a random color generated by annotation blocks. TLDR: if you change it, make sure annotated block selection and line selection in file view still work */ .cb-line-fresh .cb-content { - background: white !important; + background: white; } .cb-warning { background: #fff4dd; @@ -1000,7 +1000,7 @@ table.cb { font-size: 12.35px; &.cb-line-selected .cb-code { - background: @comment-highlight-color !important; + background: @comment-highlight-color; } span.cb-code { @@ -1050,7 +1050,7 @@ table.cb { } &.cb-line-selected > div { display: block; - background: @comment-highlight-color !important; + background: @comment-highlight-color; line-height: @cb-line-height; color: rgba(0, 0, 0, 0.3); } @@ -1069,7 +1069,7 @@ table.cb { content: attr(data-line-no); } &.cb-line-selected a { - background: @comment-highlight-color !important; + background: @comment-highlight-color; } a { diff --git a/rhodecode/public/css/codemirror.less b/rhodecode/public/css/codemirror.less --- a/rhodecode/public/css/codemirror.less +++ b/rhodecode/public/css/codemirror.less @@ -150,7 +150,7 @@ div.CodeMirror span.CodeMirror-nonmatchi } .CodeMirror-scroll { - overflow: scroll !important; /* Things will break if this is overridden */ + overflow: scroll; /* Things will break if this is overridden */ /* 30px is the magic margin used to hide the element's real scrollbars */ /* See overflow: hidden in .CodeMirror */ margin-bottom: -30px; margin-right: -30px; diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less --- a/rhodecode/public/css/comments.less +++ b/rhodecode/public/css/comments.less @@ -236,7 +236,7 @@ tr.inline-comments div { .markdown-block p, .rst-block p { - margin: .5em 0 !important; + margin: .5em 0; // TODO: lisa: This is needed because of other rst !important rules :[ } } diff --git a/rhodecode/public/css/deform.less b/rhodecode/public/css/deform.less --- a/rhodecode/public/css/deform.less +++ b/rhodecode/public/css/deform.less @@ -122,7 +122,7 @@ .deform-seq-container { .deform-seq-item { .form-group { - width: 45% !important; padding: 0 2px; float: left; clear: none; + width: 45% padding: 0 2px; float: left; clear: none; } } } @@ -131,7 +131,7 @@ .deform-seq-container { .deform-seq-item { .form-group { - width: 30% !important; padding: 0 2px; float: left; clear: none; + width: 30% padding: 0 2px; float: left; clear: none; } } } diff --git a/rhodecode/public/css/diff.less b/rhodecode/public/css/diff.less --- a/rhodecode/public/css/diff.less +++ b/rhodecode/public/css/diff.less @@ -16,7 +16,7 @@ div.diffblock.margined.comm tr { // TODO: anderson: fixing mouse-over bug. // why was it vertical-align baseline in first place?? - vertical-align: top !important; + vertical-align: top; // Force width and display for IE 9 .add-comment-content { display: inline-block; @@ -62,14 +62,14 @@ div.diffblock.margined.comm tr { &.hover, &.selected { &, del, ins { - background-color: lighten(@alert3, 10%) !important; + background-color: lighten(@alert3, 10%); } } &.commenting { &, del, ins { - background-image: none !important; - background-color: lighten(@alert4, 10%) !important; + background-image: none; + background-color: lighten(@alert4, 10%); } } } diff --git a/rhodecode/public/css/helpers.less b/rhodecode/public/css/helpers.less --- a/rhodecode/public/css/helpers.less +++ b/rhodecode/public/css/helpers.less @@ -28,11 +28,11 @@ a { cursor: pointer; } } .pull-right { - float: right !important; + float: right; } .pull-left { - float: left !important; + float: left; } .block-left { diff --git a/rhodecode/public/css/legacy_code_styles.less b/rhodecode/public/css/legacy_code_styles.less --- a/rhodecode/public/css/legacy_code_styles.less +++ b/rhodecode/public/css/legacy_code_styles.less @@ -121,45 +121,45 @@ div.markdown-block h3, div.markdown-block h4, div.markdown-block h5, div.markdown-block h6 { - border-bottom: none !important; - padding: 0 !important; - overflow: visible !important; + border-bottom: none; + padding: 0; + overflow: visible; } div.markdown-block h1 { font-size: 32px; - margin: 15px 0 15px 0 !important; - padding-bottom: 5px !important; + margin: 15px 0 15px 0; + padding-bottom: 5px; } div.markdown-block h2 { - font-size: 24px !important; - margin: 34px 0 10px 0 !important; - border-top: 3px #e6e5e5 solid !important; - padding-top: 15px !important; - padding-bottom: 8px !important; + font-size: 24px; + margin: 34px 0 10px 0; + border-top: 3px #e6e5e5 solid; + padding-top: 15px; + padding-bottom: 8px; } div.markdown-block h3 { - font-size: 18px !important; - margin: 30px 0 8px 0 !important; - padding-bottom: 2px !important; + font-size: 18px; + margin: 30px 0 8px 0; + padding-bottom: 2px; } div.markdown-block h4 { - font-size: 13px !important; - margin: 18px 0 3px 0 !important; + font-size: 13px; + margin: 18px 0 3px 0; } div.markdown-block h5 { - font-size: 12px !important; - margin: 15px 0 3px 0 !important; + font-size: 12px; + margin: 15px 0 3px 0; } div.markdown-block h6 { font-size: 12px; color: #777777; - margin: 15px 0 3px 0 !important; + margin: 15px 0 3px 0; } div.markdown-block hr { @@ -177,22 +177,22 @@ div.markdown-block blockquote, div.markdown-block dl, div.markdown-block li, div.markdown-block table { - margin: 3px 0px 13px 0px !important; - color: #424242 !important; - font-size: 13px !important; - font-family: "Helvetica" !important; - font-weight: normal !important; - overflow: visible !important; - line-height: 140% !important; + margin: 3px 0px 13px 0px; + color: #424242; + font-size: 13px; + font-family: "Helvetica"; + font-weight: normal ; + overflow: visible; + line-height: 140%; } div.markdown-block pre { - margin: 3px 0px 13px 0px !important; + margin: 3px 0px 13px 0px; padding: .5em; - color: #424242 !important; - font-size: 13px !important; - overflow: visible !important; - line-height: 140% !important; + color: #424242; + font-size: 13px; + overflow: visible; + line-height: 140%; background-color: @grey7; } @@ -209,26 +209,26 @@ div.markdown-block strong { div.markdown-block ul, div.markdown-block ol { - padding-left: 30px !important; - margin-top: 0px !important; - margin-bottom: 18px !important; + padding-left: 30px; + margin-top: 0px; + margin-bottom: 18px; } div.markdown-block ul li, div.markdown-block ol li { - list-style: disc !important; - margin: 6px !important; - padding: 0 !important; + list-style: disc; + margin: 6px; + padding: 0; } div.markdown-block ol li { - list-style: decimal !important; + list-style: decimal; } /* div.markdown-block a, div.markdown-block a:visited { - color: #4183C4 !important; + color: #4183C4; background-color: inherit; text-decoration: none; } @@ -301,43 +301,43 @@ div.rst-block h3, div.rst-block h4, div.rst-block h5, div.rst-block h6 { - border-bottom: 0 !important; - margin: 0 !important; - padding: 0 !important; - line-height: 1.5em !important; + border-bottom: 0; + margin: 0; + padding: 0; + line-height: 1.5em; } div.rst-block h1:first-child { - padding-top: .25em !important; + padding-top: .25em; } div.rst-block h2, div.rst-block h3 { - margin: 1em 0 !important; + margin: 1em 0; } div.rst-block h2 { - margin-top: 1.5em !important; - border-top: 4px solid #e0e0e0 !important; - padding-top: .5em !important; + margin-top: 1.5em; + border-top: 4px solid #e0e0e0; + padding-top: .5em; } div.rst-block p { - color: black !important; - margin: 1em 0 !important; - line-height: 1.5em !important; + color: black; + margin: 1em 0; + line-height: 1.5em; } div.rst-block ul { - list-style: disc !important; - margin: 1em 0 1em 2em !important; + list-style: disc; + margin: 1em 0 1em 2em; clear: both; } div.rst-block ol { list-style: decimal; - margin: 1em 0 1em 2em !important; + margin: 1em 0 1em 2em; } div.rst-block pre, @@ -346,18 +346,18 @@ div.rst-block code { } div.rst-block code { - font-size: 12px !important; - background-color: ghostWhite !important; - color: #444 !important; - padding: 0 .2em !important; - border: 1px solid #dedede !important; + font-size: 12px; + background-color: ghostWhite; + color: #444; + padding: 0 .2em; + border: 1px solid #dedede; } div.rst-block pre code { - padding: 0 !important; - font-size: 12px !important; - background-color: #eee !important; - border: none !important; + padding: 0; + font-size: 12px; + background-color: #eee; + border: none; } div.rst-block pre { diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -56,7 +56,7 @@ body { //--- LAYOUT ------------------// .hidden{ - display: none !important; + display: none; } .box{ @@ -120,7 +120,7 @@ ul.simple-list{ } .wide-mode-wrapper { - max-width:4000px !important; + max-width:4000px; } .wrapper { @@ -372,8 +372,8 @@ ul.auth_plugins { } .pr-mergeinfo { - min-width: 95% !important; - padding: 0 !important; + min-width: 95%; + padding: 0; border: 0; } .pr-mergeinfo-copy { @@ -381,8 +381,8 @@ ul.auth_plugins { } .pr-pullinfo { - min-width: 95% !important; - padding: 0 !important; + min-width: 95%; + padding: 0; border: 0; } .pr-pullinfo-copy { @@ -1218,7 +1218,7 @@ table.integrations { } .autocomplete-suggestions { - width: auto !important; // overrides autocomplete.js + width: auto; // overrides autocomplete.js margin: 0; border: @border-thickness solid @rcblue; border-radius: @border-radius; @@ -1469,7 +1469,7 @@ table.integrations { width: 16px; margin-bottom: 10px; padding: 0; - color: black !important; + color: black; cursor: pointer; } diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less --- a/rhodecode/public/css/navigation.less +++ b/rhodecode/public/css/navigation.less @@ -355,7 +355,7 @@ cursor: pointer; div { - overflow: visible !important; + overflow: visible; } &.sorting { @@ -426,7 +426,7 @@ // Header Repository Switcher // Select2 Dropdown #select2-drop.select2-drop.repo-switcher-dropdown { - width: auto !important; + width: auto; margin-top: 5px; padding: 1em 0; text-align: left; @@ -685,8 +685,8 @@ ul#context-pages { } .notice-box { - display:block !important; - padding: 9px 0 !important; + display:block; + padding: 9px 0; } .menulabel-notice { diff --git a/rhodecode/public/css/rcicons.less b/rhodecode/public/css/rcicons.less --- a/rhodecode/public/css/rcicons.less +++ b/rhodecode/public/css/rcicons.less @@ -138,12 +138,12 @@ //--- ICONS STYLING ------------------// -.icon-git { color: @color4 !important; } -.icon-hg { color: @color8 !important; } -.icon-svn { color: @color1 !important; } -.icon-git-inv { color: @color4 !important; } -.icon-hg-inv { color: @color8 !important; } -.icon-svn-inv { color: @color1 !important; } +.icon-git { color: @color4; } +.icon-hg { color: @color8; } +.icon-svn { color: @color1; } +.icon-git-inv { color: @color4; } +.icon-hg-inv { color: @color8; } +.icon-svn-inv { color: @color1; } .icon-repo-lock { color: #FF0000; } .icon-repo-unlock { color: #FF0000; } diff --git a/rhodecode/public/css/readme-box.less b/rhodecode/public/css/readme-box.less --- a/rhodecode/public/css/readme-box.less +++ b/rhodecode/public/css/readme-box.less @@ -12,45 +12,45 @@ div.readme_box h3, div.readme_box h4, div.readme_box h5, div.readme_box h6 { - border-bottom: none !important; - padding: 0 !important; - overflow: visible !important; + border-bottom: none; + padding: 0; + overflow: visible; } div.readme_box h1 { font-size: 32px; - margin: 15px 0 15px 0 !important; - padding-bottom: 5px !important; + margin: 15px 0 15px 0; + padding-bottom: 5px; } div.readme_box h2 { - font-size: 24px !important; - margin: 34px 0 10px 0 !important; - border-top: 3px #e6e5e5 solid !important; - padding-top: 15px !important; - padding-bottom: 8px !important; + font-size: 24px; + margin: 34px 0 10px 0; + border-top: 3px #e6e5e5 solid; + padding-top: 15px; + padding-bottom: 8px; } div.readme_box h3 { - font-size: 18px !important; - margin: 30px 0 8px 0 !important; - padding-bottom: 2px !important; + font-size: 18px; + margin: 30px 0 8px 0; + padding-bottom: 2px; } div.readme_box h4 { - font-size: 13px !important; - margin: 18px 0 3px 0 !important; + font-size: 13px; + margin: 18px 0 3px 0; } div.readme_box h5 { - font-size: 12px !important; - margin: 15px 0 3px 0 !important; + font-size: 12px; + margin: 15px 0 3px 0; } div.readme_box h6 { font-size: 12px; color: #777777; - margin: 15px 0 3px 0 !important; + margin: 15px 0 3px 0; } div.readme_box hr { @@ -68,22 +68,22 @@ div.readme_box blockquote, div.readme_box dl, div.readme_box li, div.readme_box table { - margin: 3px 0px 13px 0px !important; - color: #424242 !important; - font-size: 13px !important; - font-family: "Helvetica" !important; - font-weight: normal !important; - overflow: visible !important; - line-height: 140% !important; + margin: 3px 0px 13px 0px; + color: #424242; + font-size: 13px; + font-family: "Helvetica"; + font-weight: normal ; + overflow: visible; + line-height: 140%; } div.readme_box pre { - margin: 3px 0px 13px 0px !important; + margin: 3px 0px 13px 0px; padding: .5em; - color: #424242 !important; - font-size: 13px !important; - overflow: visible !important; - line-height: 140% !important; + color: #424242; + font-size: 13px; + overflow: visible; + line-height: 140%; background-color: @grey7; } @@ -100,26 +100,26 @@ div.readme_box strong { div.readme_box ul, div.readme_box ol { - padding-left: 30px !important; - margin-top: 0px !important; - margin-bottom: 18px !important; + padding-left: 30px; + margin-top: 0px; + margin-bottom: 18px; } div.readme_box ul li, div.readme_box ol li { - list-style: bullet !important; - margin: 6px !important; - padding: 0 !important; + list-style: bullet; + margin: 6px; + padding: 0; } div.readme_box ol li { - list-style: decimal !important; + list-style: decimal; } /* div.readme_box a, div.readme_box a:visited { - color: #4183C4 !important; + color: #4183C4; background-color: inherit; text-decoration: none; } @@ -181,43 +181,43 @@ div.rst-block h3, div.rst-block h4, div.rst-block h5, div.rst-block h6 { - border-bottom: 0 !important; - margin: 0 !important; - padding: 0 !important; - line-height: 1.5em !important; + border-bottom: 0; + margin: 0; + padding: 0; + line-height: 1.5em; } div.rst-block h1:first-child { - padding-top: .25em !important; + padding-top: .25em; } div.rst-block h2, div.rst-block h3 { - margin: 1em 0 !important; + margin: 1em 0; } div.rst-block h2 { - margin-top: 1.5em !important; - border-top: 4px solid #e0e0e0 !important; - padding-top: .5em !important; + margin-top: 1.5em; + border-top: 4px solid #e0e0e0; + padding-top: .5em; } div.rst-block p { - color: black !important; - margin: 1em 0 !important; - line-height: 1.5em !important; + color: black; + margin: 1em 0; + line-height: 1.5em; } div.rst-block ul { - list-style: disc !important; - margin: 1em 0 1em 2em !important; + list-style: disc; + margin: 1em 0 1em 2em; clear: both; } div.rst-block ol { list-style: decimal; - margin: 1em 0 1em 2em !important; + margin: 1em 0 1em 2em; } div.rst-block pre, @@ -226,18 +226,18 @@ div.rst-block code { } div.rst-block code { - font-size: 12px !important; - background-color: ghostWhite !important; - color: #444 !important; - padding: 0 .2em !important; - border: 1px solid #dedede !important; + font-size: 12px; + background-color: ghostWhite; + color: #444; + padding: 0 .2em; + border: 1px solid #dedede; } div.rst-block pre code { - padding: 0 !important; - font-size: 12px !important; - background-color: #eee !important; - border: none !important; + padding: 0; + font-size: 12px; + background-color: #eee; + border: none; } div.rst-block pre { @@ -249,4 +249,4 @@ div.rst-block pre { font-size: 12px; color: #444; background-color: @grey7; -} \ No newline at end of file +} diff --git a/rhodecode/public/css/select2.less b/rhodecode/public/css/select2.less --- a/rhodecode/public/css/select2.less +++ b/rhodecode/public/css/select2.less @@ -31,7 +31,7 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow { left: 0; right: auto; border-left: none; border-right: @border-thickness solid @grey5; border-radius: @border-radius 0 0 @border-radius; } html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {background-position: 2px 1px;} .select2-search { display: inline-block; width: 100%; min-height: 26px; margin: 0; padding-left: 4px; padding-right: 4px; position: relative; z-index: 1000; white-space: nowrap; } - .select2-search input { width: 100%; height: auto !important; min-height: 26px; padding: 4px 20px 4px 5px; margin: 0; outline: 0; } + .select2-search input { width: 100%; height: auto; min-height: 26px; padding: 4px 20px 4px 5px; margin: 0; outline: 0; } html[dir="rtl"] .select2-search input { padding: 4px 5px 4px 20px; background: #fff url('../images/select2.png') no-repeat -37px -22px; } .select2-drop.select2-drop-above .select2-search input {margin-top: 4px;} .select2-dropdown-open .select2-choice .select2-arrow { background: transparent; border-left: none; filter: none; } @@ -54,9 +54,9 @@ html[dir="rtl"] .select2-results { paddi .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover{background-position:right -11px} .select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close{background-position:right -11px} .select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close{display:none;background:none} -.select2-offscreen,.select2-offscreen:focus{clip:rect(0 0 0 0) !important;width:1px !important;height:1px !important; - border:0 !important;margin:0 !important;padding:0 !important;overflow:hidden !important; - position: absolute !important;outline:0 !important;left:0 !important;top:0 !important} +.select2-offscreen,.select2-offscreen:focus{clip:rect(0 0 0 0);width:1px;height:1px; + border:0;margin:0;padding:0;overflow:hidden; + position: absolute;outline:0;left:0;top:0} .select2-display-none, .select2-search-hidden {display:none} .select2-search input { border-color: @rclightblue; } @@ -138,7 +138,7 @@ select.select2{height:28px;visibility:hi .drop-menu { .drop-menu-base; - width: auto !important; + width: auto; } .drop-menu-no-width { diff --git a/rhodecode/public/css/tables.less b/rhodecode/public/css/tables.less --- a/rhodecode/public/css/tables.less +++ b/rhodecode/public/css/tables.less @@ -49,7 +49,7 @@ table.dataTable { } &.truncate-wrap { - white-space: nowrap !important; + white-space: nowrap; } pre { @@ -261,7 +261,7 @@ table.dataTable { // for truncated text // used inside of table cells and in code block headers .truncate-wrap { - white-space: nowrap !important; + white-space: nowrap; //truncated text .truncate {