# HG changeset patch # User Thomas De Schampheleire # Date 1506714368 -7200 # Node ID 386501cd9e00baabb80219ca610ccca0ba512cd5 # Parent 7ba91de2f6fdbd568e17d1b4f670945ad366bfb2 style: move more tag styles to kallithea-tags.less diff -r 7ba91de2f6fd -r 386501cd9e00 kallithea/public/css/style.css --- a/kallithea/public/css/style.css Fri Sep 29 21:32:25 2017 +0200 +++ b/kallithea/public/css/style.css Fri Sep 29 21:46:08 2017 +0200 @@ -474,6 +474,176 @@ background-color: #bfbfbf; color: #ffffff; } +.right .mergetag, +.right .merge { + padding: 1px 3px 1px 3px; + background-color: #fca062; + font-size: 10px; + color: #ffffff; + text-transform: uppercase; + white-space: nowrap; + border-radius: 3px; + margin-right: 2px; +} +.right .parent { + color: #666666; + clear: both; +} +.right .logtags { + line-height: 2.2em; +} +.phasetag, +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag, +.repotag, +.branchtag, +.logtags .tagtag, +.logtags .booktag { + margin: 0px 2px; +} +.phasetag, +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag, +.repotag, +.branchtag, +.tagtag, +.booktag, +.spantag { + padding: 1px 3px 1px 3px; + font-size: 10px; + color: #577632; + white-space: nowrap; + border-radius: 4px; + border: 1px solid #d9e8f8; + line-height: 1.5em; +} +table#changesets .phasetag, +table#changesets .bumpedtag, +table#changesets .divergenttag, +table#changesets .extincttag, +table#changesets .unstabletag, +table#changesets .branchtag, +table#changesets .tagtag, +table#changesets .booktag { + margin: 1.1em 0; + margin-right: 0.5em; +} +.phasetag, +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag, +.repotag, +.branchtag, +.tagtag, +.booktag { + float: left; + display: inline-block; +} +.right .logtags .phasetag, +.right .logtags .bumpedtag, +.right .logtags .divergenttag, +.right .logtags .extincttag, +.right .logtags .unstabletag, +.right .logtags .branchtag, +.right .logtags .tagtag, +.right .logtags .booktag, +.right .mergetag, +.right .merge { + float: right; + line-height: 1em; + margin: 1px 1px !important; + display: block; +} +.repotag { + border-color: #56A546; + color: #46A546; + font-size: 8px; + text-transform: uppercase; +} +#context-bar .repotag, +.repo-icons .repotag { + border-color: white; + color: white; + margin-top: 3px; +} +.repo-icons .repotag { + margin-top: 0px; + padding-top: 0px; + padding-bottom: 0px; +} +.booktag { + border-color: #46A546; + color: #46A546; +} +.tagtag { + border-color: #62cffc; + color: #62cffc; +} +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag { + background-color: #f00; + border-color: #600; + color: #fff; +} +.phasetag { + border-color: #1F14CE; + color: #1F14CE; +} +.logtags .branchtag a:hover, +.logtags .branchtag a, +.branchtag a, +.branchtag a:hover { + text-decoration: none; + color: inherit; +} +.logtags .tagtag { + padding: 1px 3px 1px 3px; + background-color: #62cffc; + font-size: 10px; + color: #ffffff; + white-space: nowrap; + border-radius: 3px; +} +.tagtag a, +.tagtag a:hover, +.logtags .tagtag a, +.logtags .tagtag a:hover { + text-decoration: none; + color: inherit; +} +.logbooks .booktag, +.logbooks .booktag, +.logtags .booktag, +.logtags .booktag { + padding: 1px 3px 1px 3px; + background-color: #46A546; + font-size: 10px; + color: #ffffff; + white-space: nowrap; + border-radius: 3px; +} +.logbooks .booktag, +.logbooks .booktag a, +.right .logtags .booktag, +.logtags .booktag a { + color: #ffffff; +} +.logbooks .booktag, +.logbooks .booktag a:hover, +.logtags .booktag, +.logtags .booktag a:hover, +.booktag a, +.booktag a:hover { + text-decoration: none; + color: inherit; +} #summary .desc { white-space: pre; width: 100%; @@ -1049,176 +1219,6 @@ .pull-right .changes .deleted { background: #FAA; } -.right .mergetag, -.right .merge { - padding: 1px 3px 1px 3px; - background-color: #fca062; - font-size: 10px; - color: #ffffff; - text-transform: uppercase; - white-space: nowrap; - border-radius: 3px; - margin-right: 2px; -} -.right .parent { - color: #666666; - clear: both; -} -.right .logtags { - line-height: 2.2em; -} -.phasetag, -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag, -.repotag, -.branchtag, -.logtags .tagtag, -.logtags .booktag { - margin: 0px 2px; -} -.phasetag, -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag, -.repotag, -.branchtag, -.tagtag, -.booktag, -.spantag { - padding: 1px 3px 1px 3px; - font-size: 10px; - color: #577632; - white-space: nowrap; - border-radius: 4px; - border: 1px solid #d9e8f8; - line-height: 1.5em; -} -table#changesets .phasetag, -table#changesets .bumpedtag, -table#changesets .divergenttag, -table#changesets .extincttag, -table#changesets .unstabletag, -table#changesets .branchtag, -table#changesets .tagtag, -table#changesets .booktag { - margin: 1.1em 0; - margin-right: 0.5em; -} -.phasetag, -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag, -.repotag, -.branchtag, -.tagtag, -.booktag { - float: left; - display: inline-block; -} -.right .logtags .phasetag, -.right .logtags .bumpedtag, -.right .logtags .divergenttag, -.right .logtags .extincttag, -.right .logtags .unstabletag, -.right .logtags .branchtag, -.right .logtags .tagtag, -.right .logtags .booktag, -.right .mergetag, -.right .merge { - float: right; - line-height: 1em; - margin: 1px 1px !important; - display: block; -} -.repotag { - border-color: #56A546; - color: #46A546; - font-size: 8px; - text-transform: uppercase; -} -#context-bar .repotag, -.repo-icons .repotag { - border-color: white; - color: white; - margin-top: 3px; -} -.repo-icons .repotag { - margin-top: 0px; - padding-top: 0px; - padding-bottom: 0px; -} -.booktag { - border-color: #46A546; - color: #46A546; -} -.tagtag { - border-color: #62cffc; - color: #62cffc; -} -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag { - background-color: #f00; - border-color: #600; - color: #fff; -} -.phasetag { - border-color: #1F14CE; - color: #1F14CE; -} -.logtags .branchtag a:hover, -.logtags .branchtag a, -.branchtag a, -.branchtag a:hover { - text-decoration: none; - color: inherit; -} -.logtags .tagtag { - padding: 1px 3px 1px 3px; - background-color: #62cffc; - font-size: 10px; - color: #ffffff; - white-space: nowrap; - border-radius: 3px; -} -.tagtag a, -.tagtag a:hover, -.logtags .tagtag a, -.logtags .tagtag a:hover { - text-decoration: none; - color: inherit; -} -.logbooks .booktag, -.logbooks .booktag, -.logtags .booktag, -.logtags .booktag { - padding: 1px 3px 1px 3px; - background-color: #46A546; - font-size: 10px; - color: #ffffff; - white-space: nowrap; - border-radius: 3px; -} -.logbooks .booktag, -.logbooks .booktag a, -.right .logtags .booktag, -.logtags .booktag a { - color: #ffffff; -} -.logbooks .booktag, -.logbooks .booktag a:hover, -.logtags .booktag, -.logtags .booktag a:hover, -.booktag a, -.booktag a:hover { - text-decoration: none; - color: inherit; -} table.code-browser { border-collapse: collapse; width: 100%; diff -r 7ba91de2f6fd -r 386501cd9e00 kallithea/public/less/kallithea-tags.less --- a/kallithea/public/less/kallithea-tags.less Fri Sep 29 21:32:25 2017 +0200 +++ b/kallithea/public/less/kallithea-tags.less Fri Sep 29 21:46:08 2017 +0200 @@ -65,3 +65,173 @@ color: #ffffff; } } +.right .mergetag, +.right .merge { + padding: 1px 3px 1px 3px; + background-color: #fca062; + font-size: 10px; + color: #ffffff; + text-transform: uppercase; + white-space: nowrap; + border-radius: 3px; + margin-right: 2px; +} +.right .parent { + color: #666666; + clear: both; +} +.right .logtags { + line-height: 2.2em; +} +.phasetag, +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag, +.repotag, +.branchtag, +.logtags .tagtag, +.logtags .booktag { + margin: 0px 2px; +} +.phasetag, +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag, +.repotag, +.branchtag, +.tagtag, +.booktag, +.spantag { + padding: 1px 3px 1px 3px; + font-size: 10px; + color: #577632; + white-space: nowrap; + border-radius: 4px; + border: 1px solid #d9e8f8; + line-height: 1.5em; +} +table#changesets .phasetag, +table#changesets .bumpedtag, +table#changesets .divergenttag, +table#changesets .extincttag, +table#changesets .unstabletag, +table#changesets .branchtag, +table#changesets .tagtag, +table#changesets .booktag { + margin: 1.1em 0; + margin-right: 0.5em; +} +.phasetag, +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag, +.repotag, +.branchtag, +.tagtag, +.booktag { + float: left; + display: inline-block; +} +.right .logtags .phasetag, +.right .logtags .bumpedtag, +.right .logtags .divergenttag, +.right .logtags .extincttag, +.right .logtags .unstabletag, +.right .logtags .branchtag, +.right .logtags .tagtag, +.right .logtags .booktag, +.right .mergetag, +.right .merge { + float: right; + line-height: 1em; + margin: 1px 1px !important; + display: block; +} +.repotag { + border-color: #56A546; + color: #46A546; + font-size: 8px; + text-transform: uppercase; +} +#context-bar .repotag, +.repo-icons .repotag { + border-color: white; + color: white; + margin-top: 3px; +} +.repo-icons .repotag { + margin-top: 0px; + padding-top: 0px; + padding-bottom: 0px; +} +.booktag { + border-color: #46A546; + color: #46A546; +} +.tagtag { + border-color: #62cffc; + color: #62cffc; +} +.bumpedtag, +.divergenttag, +.extincttag, +.unstabletag { + background-color: #f00; + border-color: #600; + color: #fff; +} +.phasetag { + border-color: #1F14CE; + color: #1F14CE; +} +.logtags .branchtag a:hover, +.logtags .branchtag a, +.branchtag a, +.branchtag a:hover { + text-decoration: none; + color: inherit; +} +.logtags .tagtag { + padding: 1px 3px 1px 3px; + background-color: #62cffc; + font-size: 10px; + color: #ffffff; + white-space: nowrap; + border-radius: 3px; +} +.tagtag a, +.tagtag a:hover, +.logtags .tagtag a, +.logtags .tagtag a:hover { + text-decoration: none; + color: inherit; +} +.logbooks .booktag, +.logbooks .booktag, +.logtags .booktag, +.logtags .booktag { + padding: 1px 3px 1px 3px; + background-color: #46A546; + font-size: 10px; + color: #ffffff; + white-space: nowrap; + border-radius: 3px; +} +.logbooks .booktag, +.logbooks .booktag a, +.right .logtags .booktag, +.logtags .booktag a { + color: #ffffff; +} +.logbooks .booktag, +.logbooks .booktag a:hover, +.logtags .booktag, +.logtags .booktag a:hover, +.booktag a, +.booktag a:hover { + text-decoration: none; + color: inherit; +} diff -r 7ba91de2f6fd -r 386501cd9e00 kallithea/public/less/style.less --- a/kallithea/public/less/style.less Fri Sep 29 21:32:25 2017 +0200 +++ b/kallithea/public/less/style.less Fri Sep 29 21:46:08 2017 +0200 @@ -986,176 +986,6 @@ .pull-right .changes .deleted { background: #FAA; } -.right .mergetag, -.right .merge { - padding: 1px 3px 1px 3px; - background-color: #fca062; - font-size: 10px; - color: #ffffff; - text-transform: uppercase; - white-space: nowrap; - border-radius: 3px; - margin-right: 2px; -} -.right .parent { - color: #666666; - clear: both; -} -.right .logtags { - line-height: 2.2em; -} -.phasetag, -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag, -.repotag, -.branchtag, -.logtags .tagtag, -.logtags .booktag { - margin: 0px 2px; -} -.phasetag, -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag, -.repotag, -.branchtag, -.tagtag, -.booktag, -.spantag { - padding: 1px 3px 1px 3px; - font-size: 10px; - color: #577632; - white-space: nowrap; - border-radius: 4px; - border: 1px solid #d9e8f8; - line-height: 1.5em; -} -table#changesets .phasetag, -table#changesets .bumpedtag, -table#changesets .divergenttag, -table#changesets .extincttag, -table#changesets .unstabletag, -table#changesets .branchtag, -table#changesets .tagtag, -table#changesets .booktag { - margin: 1.1em 0; - margin-right: 0.5em; -} -.phasetag, -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag, -.repotag, -.branchtag, -.tagtag, -.booktag { - float: left; - display: inline-block; -} -.right .logtags .phasetag, -.right .logtags .bumpedtag, -.right .logtags .divergenttag, -.right .logtags .extincttag, -.right .logtags .unstabletag, -.right .logtags .branchtag, -.right .logtags .tagtag, -.right .logtags .booktag, -.right .mergetag, -.right .merge { - float: right; - line-height: 1em; - margin: 1px 1px !important; - display: block; -} -.repotag { - border-color: #56A546; - color: #46A546; - font-size: 8px; - text-transform: uppercase; -} -#context-bar .repotag, -.repo-icons .repotag { - border-color: white; - color: white; - margin-top: 3px; -} -.repo-icons .repotag { - margin-top: 0px; - padding-top: 0px; - padding-bottom: 0px; -} -.booktag { - border-color: #46A546; - color: #46A546; -} -.tagtag { - border-color: #62cffc; - color: #62cffc; -} -.bumpedtag, -.divergenttag, -.extincttag, -.unstabletag { - background-color: #f00; - border-color: #600; - color: #fff; -} -.phasetag { - border-color: #1F14CE; - color: #1F14CE; -} -.logtags .branchtag a:hover, -.logtags .branchtag a, -.branchtag a, -.branchtag a:hover { - text-decoration: none; - color: inherit; -} -.logtags .tagtag { - padding: 1px 3px 1px 3px; - background-color: #62cffc; - font-size: 10px; - color: #ffffff; - white-space: nowrap; - border-radius: 3px; -} -.tagtag a, -.tagtag a:hover, -.logtags .tagtag a, -.logtags .tagtag a:hover { - text-decoration: none; - color: inherit; -} -.logbooks .booktag, -.logbooks .booktag, -.logtags .booktag, -.logtags .booktag { - padding: 1px 3px 1px 3px; - background-color: #46A546; - font-size: 10px; - color: #ffffff; - white-space: nowrap; - border-radius: 3px; -} -.logbooks .booktag, -.logbooks .booktag a, -.right .logtags .booktag, -.logtags .booktag a { - color: #ffffff; -} -.logbooks .booktag, -.logbooks .booktag a:hover, -.logtags .booktag, -.logtags .booktag a:hover, -.booktag a, -.booktag a:hover { - text-decoration: none; - color: inherit; -} table.code-browser { border-collapse: collapse; width: 100%;