diff --git a/assets/styles/_mixins/colors.sass b/assets/styles/_mixins/colors.sass index 06f2e61a..8ec6c329 100644 --- a/assets/styles/_mixins/colors.sass +++ b/assets/styles/_mixins/colors.sass @@ -1,4 +1,5 @@ $brighten-1: rgba(255, 255, 255, 0.05) +$brighten-2: rgba(255, 255, 255, 0.1) $black: #000 $white: #fff @@ -62,7 +63,8 @@ $color-bg-tab-hover: $white $color-bg-tab-active: $white $color-bg-log: $gray-dark-1 $color-bg-log-fold: $gray-dark-2 -$color-bg-log-highlight: $brighten-1 +$color-bg-log-hover: $brighten-2 +$color-bg-log-highlight: #747882 $color-bg-slider: $slate-blue-3 $color-bg-left: $gray-light-4 $color-bg-list-odd: $white diff --git a/assets/styles/_mixins/fonts.sass b/assets/styles/_mixins/fonts.sass index 928cd698..731a1927 100644 --- a/assets/styles/_mixins/fonts.sass +++ b/assets/styles/_mixins/fonts.sass @@ -3,7 +3,6 @@ $font-size-big: 15px $font-size-normal: 13px $font-size-small: 12px $font-size-log: 12px -$font-size-log-bigger: 13px $font-size-smaller: 12px $font-size-tiny: 11px $font-size-tiniest: 10px diff --git a/assets/styles/app/misc.sass b/assets/styles/app/misc.sass index 6b6e1246..f7a0ef11 100644 --- a/assets/styles/app/misc.sass +++ b/assets/styles/app/misc.sass @@ -11,3 +11,6 @@ width: 20px height: 20px +.warning + a + text-decoration: underline diff --git a/assets/styles/main/log.sass b/assets/styles/main/log.sass index a61ae154..52f7a927 100644 --- a/assets/styles/main/log.sass +++ b/assets/styles/main/log.sass @@ -17,27 +17,28 @@ pre#log border: 1px solid $color-border-log @include border-radius(4px) overflow-x: scroll + counter-reset: line-numbering - p.cut - margin-top: 15px - &:hover - background-color: transparent - &.highlight - background-color: transparent - a - margin: 0 p padding: 0 15px 0 50px margin: 0 min-height: 16px &:hover - background-color: $color-bg-log-highlight + background-color: $color-bg-log-hover &.highlight background-color: $color-bg-log-highlight a - margin-left: -40px - margin-right: 10px + display: inline-block + margin-left: -35px + color: #666 cursor: pointer + text-decoration: none + + &::before + content: counter(line-numbering) + counter-increment: line-numbering + padding-right: 1em + text-align: right .fold height: 16px @@ -72,7 +73,10 @@ pre#log -webkit-border-radius: 4px width: 25px -#log #tail +#log-container + position: relative + +#log-container #tail z-index: 99 position: absolute display: block diff --git a/assets/styles/tabs.sass b/assets/styles/tabs.sass index 78af1523..b50f2716 100644 --- a/assets/styles/tabs.sass +++ b/assets/styles/tabs.sass @@ -8,6 +8,7 @@ display: inline-block height: 28px margin-right: 10px + vertical-align: top background-color: $color-bg-tab border: 1px solid $color-border-light white-space: nowrap @@ -44,6 +45,8 @@ #main .tabs margin-top: 35px + h5 + min-width: 65px a text-decoration: none