Mercurial > kallithea
changeset 6878:1ba4fee6b27c
style: remove some old unused/irrelevant markup
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 14 Sep 2017 02:08:06 +0200 |
parents | c5bff92d5084 |
children | 5f1af779bddf |
files | kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/templates/changeset/changeset.html |
diffstat | 3 files changed, 6 insertions(+), 662 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css Thu Sep 14 02:08:06 2017 +0200 +++ b/kallithea/public/css/contextbar.css Thu Sep 14 02:08:06 2017 +0200 @@ -52,89 +52,32 @@ background: inherit; } -#content #context-bar .icon { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: text-bottom; -} - .navbar-text { margin-top: 0; margin-bottom: 0; } -ul#quick ul.dropdown-menu > li, -ul#context-pages ul.dropdown-menu > li { +ul#quick ul.dropdown-menu > li { border-bottom: 1px solid rgba(0,0,0,0.1); border-top: 1px solid rgba(255,255,255,0.1); } -ul#quick ul.dropdown-menu > li:first-child, -ul#context-pages ul.dropdown-menu > li:first-child { +ul#quick ul.dropdown-menu > li:first-child { border-top: none; } -ul#quick ul.dropdown-menu > li:last-child, -ul#context-pages ul.dropdown-menu > li:last-child { +ul#quick ul.dropdown-menu > li:last-child { border-bottom: none; } -#breadcrumbs { - float: left; - padding: 6px 0 5px 0; - padding-left: 5px; - font-weight: bold; - font-size: 14px; -} - -#breadcrumbs span { - font-weight: bold; - font-size: 1.4em; -} - nav.navbar #quick ul, -#revision-changer, #context-pages ul { background: #577632; } -ul#context-actions { - display: inline-block; - float: right; - border-radius: 4px; - background: #577632; -} - -#content ul#context-actions li { - padding: 0px; - border-right: 1px solid rgba(0,0,0,0.1); - border-left: 1px solid rgba(255,255,255,0.1); -} - -#context-actions a { - display: block; - cursor: pointer; - background: none; - border: none; - margin: 0px; - height: auto; - padding: 10px 10px 10px 30px; - background-repeat: no-repeat; - background-position: 10px 50%; - font-size: 1em; -} - -#context-actions a { - padding: 11px 10px 12px 30px; -} - .repo-switcher-dropdown.select2-drop.select2-drop-active .select2-results .select2-highlighted, ul.dropdown-menu li a:focus, nav.navbar #quick li:hover, #quick_login > .pull-right .list-group-item:hover, -#revision-changer:hover, #context-pages li:hover, -#context-actions li:hover, -#content #context-actions li:hover, nav.navbar #quick li.active, nav.navbar #quick li a.menu_link:focus, #context-pages li.active { @@ -146,33 +89,11 @@ border: 0; } -#content #context-actions li:first-child { - border-left: none; - border-radius: 4px 0 0px 4px; -} - -#content #context-actions li:last-child { - border-right: none; - border-radius: 0 4px 4px 0; -} - -#content #context-actions .icon { - margin: auto; - margin-bottom: 5px; - display: block; - clear: both; - float: none; -} - #content #context-pages .follow .show-following, #content #context-pages .following .show-follow { display: none; } -#content #context-pages .icon { - margin-right: 5px; -} - nav.navbar #quick li, nav.navbar #quick_login .pull-right, #content #context-pages li { @@ -201,18 +122,11 @@ nav.navbar #quick > li > a, nav.navbar #quick .select2-container .select2-choice .select2-chosen, #context-pages > ul > li > a, -#context-pages .select2-container .select2-choice .select2-chosen, -x#context-pages .dropdown-menu a { +#context-pages .select2-container .select2-choice .select2-chosen { padding: 0px 15px 1px 15px; line-height: 43px; } -nav.navbar #quick a.thin, -#context-pages a.thin, -#context-pages .dropdown-menu a.thin { - line-height: 28px !important; -} - nav.navbar #quick a#quick_login_link { padding-left: 0px; } @@ -226,42 +140,3 @@ padding-left: 5px; padding-right: 5px; } - -#revision-changer:before { - position: absolute; - top: 0px; - right: 0px; - border-right: 1px solid rgba(0,0,0,0.1); - height: 25px; - padding-top: 10px; - padding-right: 10px; -} - -#context-bar #revision-changer { - position: relative; - cursor: pointer; - border: none; - padding: 0; - margin: 0; - color: #FFFFFF; - font-size: 0.85em; - padding: 2px 15px; - padding-bottom: 3px; - padding-right: 30px; - border-right: 1px solid rgba(255,255,255,0.1); -} - -#revision-changer .branch-name, -#revision-changer .revision { - display: block; - text-align: center; - line-height: 1.5em; -} - -#revision-changer .branch-name { - font-weight: bold; -} - -#revision-changer .revision { - text-transform: uppercase; -}
--- a/kallithea/public/css/style.css Thu Sep 14 02:08:06 2017 +0200 +++ b/kallithea/public/css/style.css Thu Sep 14 02:08:06 2017 +0200 @@ -32,48 +32,11 @@ text-decoration: underline; } -div.color { - clear: both; - overflow: hidden; - position: absolute; - background: #FFF; - margin: 7px 0 0 60px; - padding: 1px 1px 1px 0; -} - -div.color a { - width: 15px; - height: 15px; - display: block; - float: left; - margin: 0 0 0 1px; - padding: 0; -} - -div.options { - clear: both; - overflow: hidden; - position: absolute; - background: #FFF; - margin: 7px 0 0 162px; - padding: 0; -} - -div.options a { - height: 1%; - display: block; - text-decoration: none; - margin: 0; - padding: 3px 8px; -} - code, .code pre, .linenos pre, div.readme pre, -div.rst-block pre, div.formatted-fixed, -#changeset_content div.message, .CodeMirror .CodeMirror-code pre { font-size: 12px; font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; @@ -87,38 +50,6 @@ font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; } -.top-left-rounded-corner { - border-top-left-radius: 8px; -} - -.top-right-rounded-corner { - border-top-right-radius: 8px; -} - -.bottom-left-rounded-corner { - border-bottom-left-radius: 8px; -} - -.bottom-right-rounded-corner { - border-bottom-right-radius: 8px; -} - -.top-left-rounded-corner-mid { - border-top-left-radius: 4px; -} - -.top-right-rounded-corner-mid { - border-top-right-radius: 4px; -} - -.bottom-left-rounded-corner-mid { - border-bottom-left-radius: 4px; -} - -.bottom-right-rounded-corner-mid { - border-bottom-right-radius: 4px; -} - .empty_data { color: #B9B9B9; } @@ -183,80 +114,17 @@ height: 44px; } -nav.navbar ul#logged-user { - margin-bottom: 5px !important; - border-radius: 0px 0px 8px 8px; - height: 37px; - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); -} - -nav.navbar ul#logged-user li { - list-style: none; - float: left; - margin: 8px 0 0; - padding: 4px 12px; - border-left: 1px solid #576622; -} - -nav.navbar ul#logged-user li.first { - border-left: none; - margin: 4px; -} - -nav.navbar ul#logged-user li.first div.gravatar { - margin-top: -2px; -} - -nav.navbar ul#logged-user li.first div.account { - padding-top: 4px; - float: left; -} - -nav.navbar ul#logged-user li.last { - border-right: none; -} - -nav.navbar ul#logged-user li a { - color: #fff; - font-weight: 700; - text-decoration: none; -} - -nav.navbar ul#logged-user li a:hover { - text-decoration: underline; -} - -nav.navbar ul#logged-user li.highlight a { - color: #fff; -} - -nav.navbar ul#logged-user li.highlight a:hover { - color: #FFF; -} nav.navbar { min-height: 44px; background-color: #577632; box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); } -.header-pos-fix, .anchor { margin-top: -46px; padding-top: 46px; } -nav.navbar #home a { - height: 40px; - width: 46px; - display: block; - background-position: 0 0; - margin: 0; - padding: 0; -} - nav.navbar #logo > .navbar-brand > img { margin-top: -9px; margin-right: 5px; @@ -271,11 +139,6 @@ float: left; } -.form-horizontal .form-group { - margin-right: 0 !important; - margin-left: 0 !important; -} - label { font-weight: inherit; } @@ -310,16 +173,6 @@ margin: 0px 1px 0px 3px; } -#content #left { - left: 0; - width: 280px; - position: absolute; -} - -#content #right { - margin: 0 60px 10px 290px; -} - div.panel-primary { box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); border: none; @@ -376,198 +229,7 @@ margin-left: 10px; } -#content div.panel h1, -#content div.panel h2, -#content div.panel h3, -#content div.panel h4, -#content div.panel h5, -#content div.panel h6, -#content div.panel div.h1, -#content div.panel div.h2, -#content div.panel div.h3, -#content div.panel div.h4, -#content div.panel div.h5, -#content div.panel div.h6 { - clear: both; - overflow: hidden; - margin: 8px 0 3px; - padding-bottom: 2px; -} - -#content div.panel p { - color: #5f5f5f; - font-size: 12px; - line-height: 150%; - margin: 0 0 10px; -} - -#content div.panel blockquote { - border-left: 4px solid #DDD; - color: #5f5f5f; - font-size: 11px; - line-height: 150%; - margin: 0 34px; - padding: 0 0 0 14px; -} - -#content div.panel blockquote p { - margin: 10px 0; - padding: 0; -} - -#content div.panel dl { - margin: 10px 0px; -} - -#content div.panel li { - font-size: 12px; -} - -#content div.panel ul.disc, -#content div.panel ul.circle { - margin: 10px 24px 10px 38px; -} - -#content div.panel ul.square { - margin: 10px 24px 10px 40px; -} - -#content div.panel img.left { - border: none; - float: left; - margin: 10px 10px 10px 0; -} - -#content div.panel img.right { - border: none; - float: right; - margin: 10px 0 10px 10px; -} - -#content div.panel div.messages { - clear: both; - overflow: hidden; - margin: 0 15px; - padding: 0; -} - -#content div.panel div.message { - float: left; - overflow: hidden; - margin: 0; - padding: 5px 0; - white-space: pre-wrap; -} -#content div.panel #changeset_content div.message { - padding: 15px 0; -} -#content div.panel div.expand { - width: 110%; - height: 14px; - font-size: 10px; - text-align: center; - cursor: pointer; - color: #666; - background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(64,96,128,0.1)); - display: none; - overflow: hidden; -} -#content div.panel div.expand .expandtext { - background-color: #ffffff; - padding: 2px; - border-radius: 2px; -} - -#content div.panel div.message a { - font-weight: 400 !important; -} - -#content div.panel div.message div.image { - float: left; - margin: 9px 0 0 5px; - padding: 6px; -} - -#content div.panel div.message div.image img { - vertical-align: middle; - margin: 0; -} - -#content div.panel div.message div.text { - float: left; - margin: 0; - padding: 9px 6px; -} - -#content div.panel div.message div.text h1, -#content div.panel div.message div.text h2, -#content div.panel div.message div.text h3, -#content div.panel div.message div.text h4, -#content div.panel div.message div.text h5, -#content div.panel div.message div.text h6 { - border: none; - margin: 0; - padding: 0; -} - -#content div.panel div.message div.text span { - height: 1%; - display: block; - margin: 0; - padding: 5px 0 0; -} - -#content div.panel div.message-error { - height: 1%; - clear: both; - overflow: hidden; - background: #FBE3E4; - border: 1px solid #FBC2C4; - color: #860006; -} - -#content div.panel div.message-error h6 { - color: #860006; -} - -#content div.panel div.message-warning { - height: 1%; - clear: both; - overflow: hidden; - background: #FFF6BF; - border: 1px solid #FFD324; - color: #5f5200; -} - -#content div.panel div.message-warning h6 { - color: #5f5200; -} - -#content div.panel div.message-notice { - height: 1%; - clear: both; - overflow: hidden; - background: #8FBDE0; - border: 1px solid #6BACDE; - color: #003863; -} - -#content div.panel div.message-notice h6 { - color: #003863; -} - -#content div.panel div.message-success { - height: 1%; - clear: both; - overflow: hidden; - background: #E6EFC2; - border: 1px solid #C6D880; - color: #4e6100; -} - -#content div.panel div.message-success h6 { - color: #4e6100; -} + #content div.panel div.form div.form-group { border-bottom: 1px solid #DDD; @@ -816,14 +478,6 @@ white-space: pre-wrap; } -#content div.panel #summary p:last-child { - margin-bottom: 9px; -} - -#content div.panel #summary p:first-of-type { - margin-top: 9px; -} - #clone_by_name.input-group, #clone_by_id.input-group { width: 100%; @@ -899,13 +553,6 @@ width: 100%; } -#summary .repo_name { - font-size: 1.6em; - font-weight: bold; - vertical-align: baseline; - clear: right -} - #footer { padding: 10px 15px; background-color: #577632; @@ -1116,14 +763,6 @@ padding: 10px 0 0 145px; } -#journal .journal_day { - font-size: 15px; - padding: 10px 0px; - border-bottom: 2px solid #DDD; - margin-left: 10px; - margin-right: 10px; -} - #journal .journal_user { color: #747474; font-size: 14px; @@ -1139,7 +778,6 @@ font-style: italic; } - #journal .journal_icon { clear: both; float: left; @@ -1205,23 +843,6 @@ margin: 10px 0 !important; } -#files_data dl dt { - float: left; - width: 60px; - margin: 0 !important; - padding: 5px; -} - -#files_data dl dd { - margin: 0 !important; - padding: 5px !important; -} - -#files_data .codeblock #editor_container .error-message { - color: red; - padding: 10px 10px 10px 26px -} - .file_history { padding-top: 10px; font-size: 16px; @@ -1249,18 +870,6 @@ text-align: right; } -#changeset_content { - border-left: 1px solid #CCC; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - padding: 5px; -} - -#changeset_content .changeset_content_header { - font-size: 1.2em; - overflow: hidden; -} - #changeset_compare_view_content .compare_view_commits { width: auto !important; } @@ -1269,19 +878,6 @@ padding: 0px 0px 0px 12px !important; } -#changeset_content .changeset_content_header .right { - float: right; - width: 20%; - text-align: right; -} - -#changeset_content .changeset_content_header .message { - white-space: pre-wrap; -} -#changeset_content .changeset_content_header .message a:hover { - text-decoration: none; -} - td.author { overflow: hidden; text-overflow: ellipsis; @@ -1395,11 +991,6 @@ text-align: left; } -#graph { - position: relative; - overflow: hidden; -} - #graph_nodes { position: absolute; width: 100px; @@ -1416,12 +1007,6 @@ position: relative; } -table#changesets { - border-collapse: collapse; - border: none; - border-color: #cdcdcd; -} - table#updaterevs-table tr.mergerow, table#updaterevs-table tr.out-of-range, table#changesets tr.mergerow, @@ -2145,7 +1730,6 @@ vertical-align: bottom; } -nav.navbar ul#logged-user, #content div.panel div.panel-heading ul.links, #content div.panel div.message div.dismiss, #content div.panel div.traffic div.legend ul { @@ -2331,7 +1915,6 @@ max-width: 320px; } -#changeset_content .changeset_content_header .date, .ac .match { font-weight: 700; padding-top: 5px; @@ -2477,99 +2060,6 @@ } -/** RST STYLE **/ - - -div.rst-block { - padding: 0px; -} - -div.rst-block h2 { - font-weight: normal; -} - -div.rst-block { - background-color: #fafafa; -} - -div.rst-block { - clear: both; - overflow: hidden; - margin: 0; - padding: 0 15px; -} - -div.rst-block h1, -div.rst-block h2, -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; -} - - -div.rst-block h1:first-child { - padding-top: .25em !important; -} - -div.rst-block h2, -div.rst-block h3 { - margin: 1em 0 !important; -} - -div.rst-block h2 { - margin-top: 1.5em !important; - border-top: 4px solid #e0e0e0 !important; - padding-top: .5em !important; -} - -div.rst-block p { - color: black !important; - margin: 1em 0 !important; - line-height: 1.5em !important; -} - -div.rst-block ul { - list-style: disc !important; - margin: 1em 0 1em 2em !important; -} - -div.rst-block ol { - list-style: decimal; - margin: 1em 0 1em 2em !important; -} - -div.rst-block code { - font-size: 12px !important; - background-color: ghostWhite !important; - color: #444 !important; - padding: 0 .2em !important; - border: 1px solid #dedede !important; -} - -div.rst-block pre code { - padding: 0 !important; - font-size: 12px !important; - background-color: #eee !important; - border: none !important; -} - -div.rst-block pre { - margin: 1em 0; - font-size: 12px; - background-color: #eee; - border: 1px solid #ddd; - padding: 5px; - color: #444; - overflow: auto; - border-radius: 3px; -} - - /** comment main **/ .comment .panel { @@ -3211,27 +2701,6 @@ font-weight: inherit; } -.text-muted { - color: #777777; -} - -.changes_txt { - clear: both; -} - -.text-nowrap { - white-space: nowrap; -} - -div.codeblock div.code-header div.author { - height: auto; - min-height: 25px; -} - -ul.user_group_member li { - clear: both; -} - #content div.panel .changelog-panel > .changelog-heading, #content div.panel .changelog-panel > ul.pagination { margin-left: 100px;
--- a/kallithea/templates/changeset/changeset.html Thu Sep 14 02:08:06 2017 +0200 +++ b/kallithea/templates/changeset/changeset.html Thu Sep 14 02:08:06 2017 +0200 @@ -152,7 +152,7 @@ </div> </div> <div class="form-group">${h.urlify_text(c.changeset.message, c.repo_name)}</div> - <div class="changes_txt"> + <div> <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %> % if c.limited_diff: ${ungettext('%s file changed', '%s files changed', len(file_diff_data)) % len(file_diff_data)}: