kallithea Changeset - 350f4730e2a3

Changeset - 350f4730e2a3

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

domruf - 8 years ago 2017-10-25 22:53:27
dominikruf@gmail.com

less: use color variables

Using variables makes it much easier to change them later or for user to
override them.

Mainly increased use of @kallithea-theme-main-color and other colors ... and
introducing diff background colors.

5 files changed with 20 insertions and 17 deletions:

kallithea/public/less/kallithea-diff.less

kallithea/public/less/kallithea-select2.less

kallithea/public/less/kallithea-tags.less

kallithea/public/less/kallithea-variables.less

kallithea/public/less/style.less

0 comments (0 inline, 0 general)

kallithea/public/less/kallithea-diff.less

➞

Show inline comments

 /* bootstrap progress bar has margin-bottom we don't want that in files list */
 .cs_files .progress {
   margin-bottom: 0;
+}
 /* progress bars should be aligned right */
 .cs_files .changes {
   float: right;
-  color: #577632;
+  color: @kallithea-theme-main-color;
+}
 /* colors for changes */
 .cs_files .changes .added {
   color: inherit;
-  background-color: #BBFFBB;
+  background-color: @add-bg-color;
   float: left;
   text-align: center;
   font-size: 9px;
   padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .deleted {
-  background-color: #FF8888;
+  background-color: @delete-bg-color;
   float: left;
   text-align: center;
   font-size: 9px;
   padding: 2px 0px 2px 0px;
+}
 /* binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 CHMOD_FILENODE = 5
 BIN_FILENODE = 6
 */
 .changes .bin {
-  background-color: #BBFFBB;
+  background-color: @add-bg-color;
   float: left;
   text-align: center;
   font-size: 9px;
   padding: 2px 0px 2px 0px;
+}
 /* added binary */
 .changes .bin.bin1 {
-  background-color: #BBFFBB;
+  background-color: @add-bg-color;
+}
 /* deleted binary*/
 .changes .bin.bin2 {
-  background-color: #FF8888;
+  background-color: @delete-bg-color;
+}
 /* mod binary*/
 .changes .bin.bin3 {
-  background-color: #DDDDDD;
+  background-color: @change-bg-color;
+}
 /* rename file*/
 .changes .bin.bin4 {
   background-color: #6D99FF;
+}
 /* chmod file*/
 .changes .bin.bin5 {
   background-color: #6D99FF;
+}
 /* center collapse button */
 .diff-collapse {
   text-align: center;
   margin-bottom: 15px;
+}
 .code-difftable {
   /* the whole line should be colored */
   border-collapse: collapse;
   border-radius: 0px !important;
   width: 100%;
   /* line coloring */
   .context {
-    background: none repeat scroll 0 0 #DDE7EF;
+    background: none repeat scroll 0 0 @highlight-line-color;
     color: #999;
+  }
   .add {
     background: none repeat scroll 0 0 #DDFFDD;
+  }
   .add ins {
     background: none repeat scroll 0 0 #AAFFAA;
     text-decoration: none;
+  }
   .del {
     background: none repeat scroll 0 0 #FFDDDD;
+  }
@@ @@ -183,30 +183,30 @@ BIN_FILENODE = 6 @@
   height: 0px;
   left: -8px;
   box-sizing: border-box;
+}
 /* comment bubble, only visible when in a commentable diff */
 .commentable-diff tr.line.add:hover td .add-bubble,
 .commentable-diff tr.line.del:hover td .add-bubble,
 .commentable-diff tr.line.unmod:hover td .add-bubble {
   display: block;
   z-index: 1;
+}
 .add-bubble div {
-  background: #577632;
+  background: @kallithea-theme-main-color;
   width: 16px;
   height: 16px;
   cursor: pointer;
   padding: 0 2px 2px 0.5px;
-  border: 1px solid #577632;
+  border: 1px solid @kallithea-theme-main-color;
   border-radius: 3px;
   box-sizing: border-box;
+}
 .add-bubble div:before {
   font-size: 14px;
   color: #ffffff;
   font-family: "kallithea";
   content: '\1f5ea';
+}
 .add-bubble div:hover {
   transform: scale(1.2, 1.2);
+}

kallithea/public/less/kallithea-select2.less

➞

Show inline comments

@@ @@ -14,25 +14,25 @@ @@
+  }
   .select2-choice .select2-chosen {
     margin-right: 0;
     line-height: @line-height-computed;
+  }
   .select2-arrow {
     display: none !important;
+  }
+}
 .branch-switcher-dropdown.select2-drop.select2-drop-active,
 .repo-switcher-dropdown.select2-drop.select2-drop-active {
   box-shadow: none;
-  background-color: #577632;
+  background-color: @kallithea-theme-main-color;
   border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+}
 .repo-switcher-dropdown.select2-drop.select2-drop-active {
   color: black;
   .select2-result.select2-highlighted {
     color: @navbar-inverse-link-hover-color;
     background-color: @navbar-inverse-link-hover-bg;
+  }
   .select2-result-label {
     color: white;
+  }

kallithea/public/less/kallithea-tags.less

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ @@
 .metatag[data-tag="lang"] {
   background-color: #FAF474;
+}
 .metatag[data-tag="license"] {
   border: solid 1px #9CF;
   background-color: #DEF;
+}
 .metatag[data-tag="see"] {
   border: solid 1px #CBD;
   background-color: #EDF;
+}
 a.metatag[data-tag="license"]:hover {
-  background-color: #577632;
+  background-color: @kallithea-theme-main-color;
   color: #FFF;
   text-decoration: none;
+}
 #perms .perm_tag {
   position: relative;
   top: -2px;
   margin-left: 3px;
   padding: 3px 3px 1px 3px;
   font-size: 10px;
   font-weight: bold;
   text-transform: uppercase;
@@ @@ -92,25 +92,25 @@ a.metatag[data-tag="license"]:hover { @@
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
   padding: 1px 3px 1px 3px;
   font-size: 10px;
-  color: #577632;
+  color: @kallithea-theme-main-color;
   white-space: nowrap;
   border-radius: 4px;
   border: 1px solid #d9e8f8;
+}
 table#changesets .phasetag,
 table#changesets .bumpedtag,
 table#changesets .divergenttag,
 table#changesets .extincttag,
 table#changesets .unstabletag,
 table#changesets .branchtag,
 table#changesets .tagtag,
 table#changesets .booktag {

kallithea/public/less/kallithea-variables.less

➞

Show inline comments

@@ @@ -23,12 +23,15 @@ @@
 @navbar-inverse-link-active-bg:     @navbar-inverse-link-hover-bg;
 @navbar-inverse-toggle-hover-bg:    @navbar-inverse-link-hover-bg;
 @navbar-inverse-toggle-border-color:@kallithea-theme-main-color;
 @nav-pills-active-link-hover-color: @navbar-inverse-color;
 @nav-pills-active-link-hover-bg:    @navbar-inverse-bg;
 @dropdown-link-color:               @navbar-inverse-color;
 @dropdown-bg:                       @navbar-inverse-bg;
 @headings-font-weight:              700;
 /* custom variables */
 @highlight-color:                   #FAFFA6;
 @highlight-line-color:              #DDE7EF;
 @add-bg-color:                      #BBFFBB;
 @change-bg-color:                   #DDDDDD;
 @delete-bg-color:                   #FF8888;

kallithea/public/less/style.less

➞

Show inline comments

@@ @@ -811,25 +811,25 @@ div.pr { @@
   margin: 0px 15px;
   padding: 4px 4px;
+}
 tr.pr-closed td {
   background-color: #eee !important;
   color: #555 !important;
+}
 span.pr-closed-tag {
   margin-bottom: 1px;
   margin-right: 1px;
   padding: 1px 3px;
   font-size: 10px;
-  color: #577632;
+  color: @kallithea-theme-main-color;
   white-space: nowrap;
   border-radius: 4px;
   border: 1px solid #d9e8f8;
   line-height: 1.5em;
+}
 .panel-body .pr-box {
   max-width: 978px;
   margin-right: 15px;
+}
 #s2id_org_ref,
 #s2id_other_ref,
 #s2id_org_repo,
@@ @@ -926,51 +926,51 @@ div.comment-prev-next-links div.next-com @@
+}
 /* use same badge coloring in navbar inverse as in panel-heading */
 .navbar-inverse {
   .badge {
     color: @navbar-inverse-bg;
     background-color: @navbar-inverse-color;
+  }
+}
 /* pygments style */
 div.search-code-body pre .match {
-  background-color: #FAFFA6;
+  background-color: @highlight-color;
+}
 div.search-code-body pre .break {
-  background-color: #DDE7EF;
+  background-color: @highlight-line-color;
   width: 100%;
   color: #747474;
   display: block;
+}
 div.annotatediv {
   margin-left: 2px;
   margin-right: 4px;
+}
 .code-highlight {
   border-left: 1px solid #ccc;
+}
 .code-highlight pre,
 .linenodiv pre {
   padding: 5px 2px 0px 5px;
   margin: 0;
+}
 .code-highlight pre div:target {
   background-color: #FFFFBE !important;
+}
 .linenos a { text-decoration: none; }
 /* Stylesheets for the context bar */
 #quick_login > .pull-right .list-group-item {
-  background-color: #577632;
+  background-color: @kallithea-theme-main-color;
   border: 0;
+}
 #content #context-pages .follow .show-following,
 #content #context-pages .following .show-follow {
   display: none;
+}
 nav.navbar #quick > li > a,
 #context-pages > ul > li > a {
   height: @navbar-height;
+}

0 comments (0 inline, 0 general)