~edwargix/git.sr.ht

fcbf809456de0ae0b39e5d6627b481f17e2638c9 — Drew DeVault 8 years ago ee5e4ca
Update SCSS to srht standard
4 files changed, 5 insertions(+), 148 deletions(-)

M .gitmodules
M Makefile
D scss/bootstrap
M scss/main.scss
M .gitmodules => .gitmodules +0 -3
@@ 1,3 0,0 @@
[submodule "scss/bootstrap"]
	path = scss/bootstrap
	url = https://github.com/twbs/bootstrap.git

M Makefile => Makefile +4 -7
@@ 1,8 1,3 @@
# Builds static assets
# Depends on:
# - scss
# - coffeescript
# - inotify-tools
# Run `make` to compile static assets
# Run `make watch` to recompile whenever a change is made



@@ 11,13 6,15 @@
SCRIPTS+=$(patsubst js/%.js,static/%.js,$(wildcard js/*.js))
_STATIC:=$(patsubst _static/%,static/%,$(wildcard _static/*))

SRHT_PATH?=/usr/lib/python3.6/site-packages/srht

static/%: _static/%
	@mkdir -p static/
	cp $< $@

static/main.css: scss/*.scss
static/main.css: scss/*.scss ${SRHT_PATH}/scss/*.scss
	@mkdir -p static/
	scss scss/main.scss $@
	sassc -I${SRHT_PATH}/scss scss/main.scss $@

static/%.js: js/%.js
	@mkdir -p static/

D scss/bootstrap => scss/bootstrap +0 -1
@@ 1,1 0,0 @@
Subproject commit 295c93846c154fb461f85b30e663102f7e171104

M scss/main.scss => scss/main.scss +1 -137
@@ 1,140 1,4 @@
@import "bootstrap/scss/bootstrap";

$base-font-size: 0.9rem;

body {
  font-family: sans-serif;
  font-size: $base-font-size;
}

p {
  margin-bottom: 0.5rem;
}

label {
  margin-bottom: 0.25rem;
}

input[type="text"],
input[type="email"],
input[type="password"],
textarea.form-control {
  border-radius: 0;
  border-color: #888;
  color: $gray-dark;
  padding: 0.25rem 0.375rem;

  &:active, &:focus {
    color: $gray-dark;
  }
}

h1, h2 {
  margin-top: 0;
}

h3 {
  font-size: 1.3rem;
  border-bottom: 1px solid $gray-lighter;
  padding-bottom: 0.25rem;

  small {
    @extend .text-muted;
    font-size: 1rem;
    margin-left: 1rem;
  }
}

h4 {
  margin-top: 1rem;
  font-size: 1.1rem;
}

section {
  padding-bottom: 0.5rem;
}

.container {
  margin: 0;
}

.btn {
  border-radius: 0;
  padding: 0.1rem 0.75rem;

  &.btn-default {
    transition: background 0.1s linear;
    background: $gray-lighter;
    border: $gray-dark 1px solid;
    font-size: 0.9rem;
    color: black;

    &:hover {
      background: $gray-lightest;
    }
  }

  &.btn-danger {
    border: $btn-danger-border 1px solid;
    font-size: 0.9rem;
  }

  &.btn-link {
    padding: 0;
    font-size: $base-font-size;
    margin-top: -0.1rem;
  }
}

.navbar {
  .navbar-brand {
    padding: 0 1rem 0 0;
    line-height: 1.8;
  }

  li {
    font-size: $base-font-size;
    line-height: 1.8;
  }

  .login {
    padding: 0.425rem 0;
    font-size: $base-font-size;
    line-height: 1.5;
  }
}

.nav-tabs {
  padding-left: 1rem;
  margin-bottom: 0.5rem;
  border-bottom: 3px #ddd solid;

  .nav-link {
    padding: 0 1rem;
    border-radius: 0;
    color: black;
    cursor: pointer;

    &.active, &.active:hover {
      color: black;
      background: #ddd;
    }
  }
}

.alert {
  padding: 0.5rem;
  border-radius: 0;

  .form-group & {
    margin-top: 1rem;
  }
}

.text-centered {
  text-align: center;
}

@import "base";
@import "cgit";

div#cgit {