Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed app/assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file added app/assets/fonts/fa-brands-400.ttf
Binary file not shown.
Binary file added app/assets/fonts/fa-brands-400.woff2
Binary file not shown.
Binary file added app/assets/fonts/fa-regular-400.ttf
Binary file not shown.
Binary file added app/assets/fonts/fa-regular-400.woff2
Binary file not shown.
Binary file added app/assets/fonts/fa-solid-900.ttf
Binary file not shown.
Binary file added app/assets/fonts/fa-solid-900.woff2
Binary file not shown.
Binary file added app/assets/fonts/fa-v4compatibility.ttf
Binary file not shown.
Binary file added app/assets/fonts/fa-v4compatibility.woff2
Binary file not shown.
Binary file removed app/assets/fonts/fontawesome-webfont.eot
Binary file not shown.
2,671 changes: 0 additions & 2,671 deletions app/assets/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file removed app/assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed app/assets/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed app/assets/fonts/fontawesome-webfont.woff2
Binary file not shown.
Binary file added app/assets/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
288 changes: 288 additions & 0 deletions app/assets/fonts/glyphicons-halflings-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/fonts/glyphicons-halflings-regular.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
10,926 changes: 8,630 additions & 2,296 deletions app/assets/stylesheets/font-awesome.css.erb

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions app/assets/stylesheets/overrides/_status_badges.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.status {
--status-green: #77E46E;
--status-blue: #77C8EA;
--status-gray: #7A7A7A;
--status-gray-light: #AEAEAE;
--status-gray-dark: #4B4B4B;

color: var(--status-gray-dark);
background-color: inherit;


&.published {
font-weight: bold;
.indicator {
color: var(--status-green);
}
}

&.active {
font-weight: bold;
background-color: inherit !important;
.indicator {
color: var(--status-green);
}
}

&.draft {
.indicator {
color: var(--status-blue);
}
}

&.withdrawn, &.expired {
color: var(--status-gray);
.indicator {
color: var(--status-gray-light);
}
}
}
18 changes: 18 additions & 0 deletions app/assets/stylesheets/overrides/_theme_extensions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Radius Theme Customizations / Extensions
.panel-body {
fieldset {
&.last-child,
&:last-child {
padding-bottom: 0;
}
}
}

.panel-errors {
padding: $panel-body-padding;

.alert {
margin-bottom: 0;
padding-bottom: $line-height-computed;
}
}
131 changes: 131 additions & 0 deletions app/assets/stylesheets/overrides/_utility.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
/* PADDING */
.p-0 {
padding: 0px !important;
}

.pl-05 {
padding-left: 5px !important;
}

.pr-05 {
padding-right: 5px !important;
}

.pr-1 {
padding-right: 10px !important;
}

.px-1 {
padding-left: 10px !important;
padding-right: 10px !important;
}

.px-2 {
padding-left: 20px !important;
padding-right: 20px !important;
}

.py-2 {
padding-top: 20px !important;
padding-bottom: 20px !important;
}

.py-15 {
padding-top: 15px !important;
padding-bottom: 15px !important;
}

.pb-25 {
padding-bottom: 25px !important;
}

.leftpad {
padding-left: 15px !important;
}

/* MARGIN */

.mb-1 {
margin-bottom: 10px !important;
}

.ml-2 {
margin-left: 20px !important;
}

.mt-1 {
margin-top: 10px !important;
}

.mt-2 {
margin-top: 20px !important;
}

.mt-3 {
margin-top: 30px !important;
}

.mb-1 {
margin-bottom: 10px !important;
}

.mb-2 {
margin-bottom: 20px !important;
}

.mb-3 {
margin-bottom: 30px !important;
}

.mb-4 {
margin-bottom: 40px !important;
}

.mb-05 {
margin-bottom: 5px !important;
}

.w-100 {
width: 100%;
}

.w-20 {
width: 20%;
}

.w-40 {
width: 40%;
}

/* BORDER */
.border-bottom {
border-bottom: 1px solid #EEEEEE;
}

.no-top-border {
border-top: none !important;
}

/* OTHER */
.truncate {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

.hidden {
display: none;
}

hr.top-margin {
margin: 1em 0em 0em 0em;
}

/* TEXT */
.centered {
text-align: center;
}

.left-aligned {
text-align: left;
}
19 changes: 1 addition & 18 deletions app/assets/stylesheets/radius-theme.scss
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
@import "radius-theme/app";
@import "radius-theme/masquerade";
@import "overrides/theme_extensions";

// Radius Theme Customizations / Extensions
.panel-body {
fieldset {
&.last-child,
&:last-child {
padding-bottom: 0;
}
}
}

.panel-errors {
padding: $panel-body-padding;

.alert {
margin-bottom: 0;
padding-bottom: $line-height-computed;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
display: inline-block;

+ li:before {
content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
// [converter] Workaround for https://github.com/sass/libsass/issues/1115
$nbsp: "\00a0";
content: "#{$breadcrumb-separator}#{$nbsp}"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px;
color: $breadcrumb-color;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
@include border-right-radius(0);
}
}
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
// Need .dropdown-toggle since :last-child doesn't apply, given that a .dropdown-menu is used immediately after it
.btn-group > .btn:last-child:not(:first-child),
.btn-group > .dropdown-toggle:not(:first-child) {
@include border-left-radius(0);
Expand Down Expand Up @@ -173,12 +173,12 @@
border-radius: 0;
}
&:first-child:not(:last-child) {
border-top-right-radius: $btn-border-radius-base;
@include border-top-radius($btn-border-radius-base);
@include border-bottom-radius(0);
}
&:last-child:not(:first-child) {
border-bottom-left-radius: $btn-border-radius-base;
@include border-top-radius(0);
@include border-bottom-radius($btn-border-radius-base);
}
}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
color: $carousel-control-color;
text-align: center;
text-shadow: $carousel-text-shadow;
background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
// We can't have this transition here because WebKit cancels the carousel
// animation if you trip this while in the middle of another animation.

Expand Down Expand Up @@ -240,18 +241,18 @@
.glyphicon-chevron-right,
.icon-prev,
.icon-next {
width: 30px;
height: 30px;
margin-top: -15px;
font-size: 30px;
width: ($carousel-control-font-size * 1.5);
height: ($carousel-control-font-size * 1.5);
margin-top: ($carousel-control-font-size / -2);
font-size: ($carousel-control-font-size * 1.5);
}
.glyphicon-chevron-left,
.icon-prev {
margin-left: -15px;
margin-left: ($carousel-control-font-size / -2);
}
.glyphicon-chevron-right,
.icon-next {
margin-right: -15px;
margin-right: ($carousel-control-font-size / -2);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ output {
// Placeholder
@include placeholder;

// Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand {
border: 0;
background-color: transparent;
}

// Disabled and read-only inputs
//
// HTML5 says that controls under a fieldset > legend:first-child won't be
Expand Down Expand Up @@ -177,7 +183,7 @@ input[type="search"] {
// set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
//
// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
// Note that as of 9.3, iOS doesn't support `week`.

@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"],
Expand Down Expand Up @@ -431,10 +437,10 @@ input[type="checkbox"] {
.has-feedback label {

& ~ .form-control-feedback {
top: ($line-height-computed + 5); // Height of the `label` and its margin
top: ($line-height-computed + 5); // Height of the `label` and its margin
}
&.sr-only ~ .form-control-feedback {
top: 0;
top: 0;
}
}

Expand Down Expand Up @@ -595,7 +601,7 @@ input[type="checkbox"] {
.form-group-lg {
@media (min-width: $screen-sm-min) {
.control-label {
padding-top: (($padding-large-vertical * $line-height-large) + 1);
padding-top: ($padding-large-vertical + 1);
font-size: $font-size-large;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
}

// Individual icons
.glyphicon-asterisk { &:before { content: "\2a"; } }
.glyphicon-plus { &:before { content: "\2b"; } }
.glyphicon-asterisk { &:before { content: "\002a"; } }
.glyphicon-plus { &:before { content: "\002b"; } }
.glyphicon-euro,
.glyphicon-eur { &:before { content: "\20ac"; } }
.glyphicon-minus { &:before { content: "\2212"; } }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@

width: 100%;
margin-bottom: 0;

&:focus {
z-index: 3;
}
}
}

Expand Down Expand Up @@ -79,18 +83,18 @@
text-align: center;
background-color: $input-group-addon-bg;
border: 1px solid $input-group-addon-border-color;
border-radius: $border-radius-base;
border-radius: $input-border-radius;

// Sizing
&.input-sm {
padding: $padding-small-vertical $padding-small-horizontal;
font-size: $font-size-small;
border-radius: $border-radius-small;
border-radius: $input-border-radius-small;
}
&.input-lg {
padding: $padding-large-vertical $padding-large-horizontal;
font-size: $font-size-large;
border-radius: $border-radius-large;
border-radius: $input-border-radius-large;
}

// Nuke default margins from checkboxes and radios to vertically center within.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
.container &,
.container-fluid & {
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
padding-left: ($grid-gutter-width / 2);
padding-right: ($grid-gutter-width / 2);
}

.container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
.modal-header {
padding: $modal-title-padding;
border-bottom: 1px solid $modal-header-border-color;
min-height: ($modal-title-padding + $modal-title-line-height);
@include clearfix;
}
// Close icon
.modal-header .close {
Expand Down
Loading