From 49507ea377f21976e9cafbb80370e588cd9682b3 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 19 Feb 2016 14:09:48 -0500 Subject: [PATCH 01/38] Beginnings of changes --- public/sass/_variables.scss | 12 ++++++++---- public/sass/components/_gf-form.scss | 10 ++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index 85e97fda5c6..4fe5be63434 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -61,7 +61,7 @@ $grid-breakpoints: ( // // Define the maximum width of `.container` for different screen sizes. -$container-max-widths: ( +$container-max-widths: (tork sm: 576px, md: 720px, lg: 940px, @@ -170,9 +170,13 @@ $input-padding-y: .6rem !default; $input-line-height: 1.35rem !default; $input-btn-border-width: 1px; -$input-border-radius: $border-radius !default; -$input-border-radius-lg: $border-radius-lg !default; -$input-border-radius-sm: $border-radius-sm !default; +$input-border-radius: 0 $border-radius $border-radius 0 !default; +$input-border-radius-lg: 0 $border-radius-lg $border-radius-lg 0 !default; +$input-border-radius-sm: 0 $border-radius-sm $border-radius-sm 0 !default; + +$label-border-radius: $border-radius 0 0 $border-radius !default; +$label-border-radius-lg: $border-radius-lg 0 0 $border-radius-lg !default; +$label-border-radius-sm: $border-radius-sm 0 0 $border-radius-sm !default; $input-padding-x-sm: .5rem !default; $input-padding-y-sm: .25rem !default; diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index d3ab196dd30..e300f4aa304 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -1,4 +1,5 @@ -$gf-form-margin: 0.4rem; +$gf-form-margin: 0.2rem; +$gf-form-label-margin: 0.2rem; .gf-form { margin-bottom: $gf-form-margin; @@ -49,8 +50,9 @@ $gf-form-margin: 0.4rem; background-color: $input-label-bg; display: block; font-size: $font-size-sm; - margin-right: $gf-form-margin; + margin-right: $gf-form-label-margin; border: $input-btn-border-width solid transparent; + @include border-radius($label-border-radius-sm); } .gf-form-checkbox { @@ -79,8 +81,8 @@ $gf-form-margin: 0.4rem; background-color: $input-bg; background-image: none; background-clip: padding-box; - border: $input-btn-border-width solid $input-border-color; - @include border-radius($input-border-radius); + border: $input-btn-border-width solid transparent; + @include border-radius($input-border-radius-sm); @include box-shadow($input-box-shadow); transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; From bd0357b637b7b95d6e7818bf6cdde293048887a3 Mon Sep 17 00:00:00 2001 From: Trent White Date: Fri, 19 Feb 2016 17:34:09 -0500 Subject: [PATCH 02/38] added angular gradient to page and login. Tweaked header underline to not be so heavy. Tweaked stacked logo on login. Created an alternative to avatar when there's no connection to gravatar - could use work, but I think you get the idea. --- public/app/core/components/sidemenu/sidemenu.html | 3 ++- public/app/partials/login.html | 2 +- public/sass/_variables.dark.scss | 2 ++ public/sass/_variables.light.scss | 6 ++++-- public/sass/components/_dashboard.scss | 2 +- public/sass/components/_sidemenu.scss | 9 +++++++++ public/sass/layout/_page.scss | 7 +++++-- public/sass/pages/_login.scss | 15 +++++++++++++-- 8 files changed, 37 insertions(+), 9 deletions(-) diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index f4221367fdf..66ee0b6d8b9 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -3,7 +3,8 @@
  • - + + ?
    {{ctrl.user.name}} diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 6f437a02824..b7aa340bfed 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -1,4 +1,4 @@ -
    +