kallithea Changeset - 4d1837a9b504

Changeset - 4d1837a9b504

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 8 years ago 2018-02-16 01:40:00
mads@kiilerich.com

less: prepare styling for different navbar-height

Use navbar-height in the custom styling of select2 navbar entries so they
adjust to the navbar height.

The custom navbar-brand styling should however only apply to the main navbar.
The contextbar is better without.

2 files changed with 3 insertions and 4 deletions:

kallithea/public/less/kallithea-select2.less

kallithea/public/less/style.less

0 comments (0 inline, 0 general)

kallithea/public/less/kallithea-select2.less

➞

Show inline comments

 .branch-switcher,
 .repo-switcher {
   .select2-choice {
     height: 100%;
     padding: 0;
+  }
   .select2-container,
   .select2-choice,
   .select2-choice > span {
     background: transparent !important;
     border: 0 !important;
     box-shadow: none !important;
     color: #FFFFFF !important;
+  }
   .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: @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;
+  }
+}
 /* fix padding of select2 entries in navbar to match .navbar-nav > li > a */
 .navbar-inverse {
   .navbar-nav {
     > li > .select2-container a {
       padding: @nav-link-padding;
       height: @navbar-height;
       padding-top:    @navbar-padding-vertical;
       padding-bottom: @navbar-padding-vertical;
+    }
     li.active > .select2-container,
     .select2-container:hover,
     .select2-container:focus,
     .select2-container-active {
       color: @navbar-inverse-link-hover-color;
       background-color: @navbar-inverse-link-hover-bg;
+    }
+  }
+}
 .select2-container {
   /* select2 already has border and padding, remove bootstrap form-control border and padding */
   &.form-control {
     border: 0;
     padding: 0;
+  }
   /* make select2 as big as form-controls */
   .select2-choice {
     height: 100%;
+  }
   .select2-chosen {
     line-height: @input-height-base - 2; /* subtract border width */
+  }
+}
 /* highlight query in user autocomplete search results */
 .select2-results .match {
   font-weight: 700;
+}
 /* fix select2 input style if input-sm is used */
 .select2-container.input-sm input {
   .input-sm;
+}

kallithea/public/less/style.less

➞

Show inline comments

 body {
   background: url("../images/background.png") repeat scroll 0 0 #B0B0B0;
+}
 /* pseude content that should not be selected or copied by the user */
 [data-pseudo-content]:before {
   content: attr(data-pseudo-content);
+}
 /* class for texts where newlines should be preserved, for very light-weight ascii art markup (like pull request descriptions) */
 .formatted-fixed {
   white-space: pre-wrap;
+}
 /* use monospace for changeset hashes */
 .changeset_hash {
   font-family: @font-family-monospace;
+}
 /* Note: class 'icon-empty' or 'icon-gravatar' can be used to get icon-ish styling without an actual glyph */
 i[class^='icon-empty'],
 i[class^='icon-gravatar'] {
   background-repeat: no-repeat;
   background-position: center;
   display: inline-block;
   min-width: 16px;
   min-height: 16px;
   margin: -2px 0 -4px 0;
+}
 .inline-comments-general.show-general-status .hidden.general-only {
   display: block !important;
+}
 .truncate {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
   -ms-text-overflow: ellipsis;
+}
 .truncate.autoexpand:hover {
   overflow: visible;
+}
 /* show comment anchors when hovering over panel-heading */
 a.permalink {
   visibility: hidden;
+}
 .panel-heading:hover .permalink {
   visibility: visible;
+}
 .navbar-inverse {
   border: none;
+}
 /* logo */
 nav.navbar .navbar-brand {
+nav.navbar.mainmenu > .navbar-header > .navbar-brand {
   font-size: 20px;
   padding-top: 12px;
+}
 nav.navbar.mainmenu .navbar-brand .branding {
   &:before {
   > .branding:before {
     content: "";
     display: inline-block;
     margin-right: .2em;
     background-image: url(@kallithea-logo-url);
     width: @kallithea-logo-width;
     height: @kallithea-logo-height;
     margin-bottom: -@kallithea-logo-bottom;
     margin-top: -12px;
+  }
+}
 /* code highlighting */
 /* don't use bootstrap style for code blocks */
 .code-highlighttable pre {
   background: inherit;
   border: 0;
+}
 /* every direct child of a panel, that is not .panel-heading, should auto
  * overflow to prevent overflowing of elements like text boxes and tables */
 .panel > :not(.panel-heading){
   overflow-x: auto;
   min-height: 0.01%;
+}
 /* allow other exceptions to automatic overflow-x */
 .panel > .overflow-x-visible {
   overflow-x: visible;
+}
 /* search highlighting */
 div.search-code-body pre .match {
   background-color: @highlight-color;
+}
 div.search-code-body pre .break {
   background-color: @highlight-line-color;
   width: 100%;
   display: block;
+}
 /* use @alert-danger-text for form error messages and .alert-danger for the input element */
 .form-group .error-message {
   color: @alert-danger-text;
   display: inline-block;
   padding-top: 5px;
   &:empty{
     display: none;
+  }
+}
 input.error {
   .alert-danger;
+}
 /* datatable */
 .dataTables_left {
   .pull-left;
+}
 .dataTables_right {
   .pull-right;
+}
 /* make all datatable paginations small */
 .dataTables_paginate .pagination {
   .pagination-sm;
+}
 /* show column sort icons in our font ... and before column header */
 table.dataTable {
   .sorting_asc:before {
     font-family: "kallithea";
     content: "\23f6";
     padding-right: 8px;
+  }
   .sorting_desc:before {
     font-family: "kallithea";
     content: "\23f7";
     padding-right: 8px;
+  }
   .sorting:before {
     font-family: "kallithea";
     content: "\2195";
     padding-right: 8px;
     opacity: 0.5;
+  }
   .sorting_asc:after,
   .sorting_desc:after,
   .sorting:after {
     content: "" !important;
+  }
+}
 /* language bars (summary page) */
 #lang_stats {
   .progress-bar {
     min-width: 15px;
     border-top-right-radius: 8px;

0 comments (0 inline, 0 general)