Skip to content

style: Final colour simplification #5021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbiin merged 33 commits into from
Sep 6, 2021
Merged

style: Final colour simplification #5021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8792016
style: Changed pale red to be paler for better contrast.
mgrhm Mar 29, 2021
469b0e0
style: Added darker borders on warning and danger button hover.
mgrhm Mar 29, 2021
a3b5ff1
style: Replaced #e5e5e5 with #d0d0d0 (only two uses).
mgrhm Mar 29, 2021
0d143d1
chore: Removed unused background from svg class.
mgrhm Mar 29, 2021
0ffef90
chore: Standardised all #fff instances to #ffffff.
mgrhm Mar 29, 2021
ebad347
chore: Standardised all #eee instances to #eeeeee.
mgrhm Mar 29, 2021
d7ff51a
style: Replaced #ddd with #d0d0d0.
mgrhm Mar 29, 2021
9d50db9
chore: Standardised all #999 instances to #999999.
mgrhm Mar 29, 2021
a82b5a7
style: Replaced #333 with #313436.
mgrhm Mar 29, 2021
2af901b
style: Replaced #ccc with #d0d0d0 (only one use).
mgrhm Mar 29, 2021
c4b7c7d
style: Replaced #900 with #b22222 (only one use).
mgrhm Mar 29, 2021
be924b1
style: Replaced #777 with #999999 (only one use).
mgrhm Mar 29, 2021
0f94680
Merge remote-tracking branch 'upstream/master' into further-colour-si…
mgrhm Mar 30, 2021
0210674
style: Updated background and border colours on edit boxes.
mgrhm Mar 30, 2021
6c3bd17
style: Replaced RGBA colours with hex codes in app-ltr.sass.
mgrhm Mar 30, 2021
c5b61c9
style: Replaced RGBA colours with hex codes in buttons.scss.
mgrhm Mar 30, 2021
9f12e3b
style: Replaced RGBA colour with hex codes in header.scss
mgrhm Mar 30, 2021
bcdbdf3
style: Replaced RGBA colour with hex codes in modal.scss.
mgrhm Mar 30, 2021
4ef0ada
style: Replaced RGBA colour with hex codes in people.scss.
mgrhm Mar 30, 2021
c7c4a8b
style: Replaced RGBA colour with hex codes in stripe.scss.
mgrhm Mar 30, 2021
6fdda6f
style: Replaced #dcdcdc with #d0d0d0 (six instances).
mgrhm Mar 30, 2021
e962f87
style: Removed two one-use colours (#47c1bf, #58748c).
mgrhm Mar 30, 2021
0e2e042
fix: Removed stray closing brace.
mgrhm Mar 30, 2021
c8bcf75
style: Replaced "white" with #ffffff hex-code.
mgrhm Mar 30, 2021
7f0b85a
style: Removed RGBA and RGB values in header.scss.
mgrhm Mar 30, 2021
c0f5d02
chore: Added updated CSS and JSON files.
mgrhm Mar 30, 2021
5504a0d
style: Reduced opacity of placeholder text in search box.
mgrhm Mar 30, 2021
e8b35ab
Merge remote-tracking branch 'origin/master' into further-colour-simp…
asbiin Apr 27, 2021
96c3c09
fix journal
asbiin Apr 27, 2021
4352c21
chore: Removed compiled CSS and JSON assets.
mgrhm Aug 25, 2021
5bcbc1f
remove files
asbiin Aug 26, 2021
9d731eb
Merge remote-tracking branch 'origin/master' into further-colour-simp…
asbiin Aug 26, 2021
9dd081f
style: Changed medium yellow to brighter colour, restored 'ivory' col…
mgrhm Sep 2, 2021
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
73 changes: 36 additions & 37 deletions resources/sass/app-ltr.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ $bg-hover-monica: #d7e3ec;
}

.bg-pale-red {
background-color: #f4c8b9;
background-color: #f4cecd;
}

.box-shadow {
background: #fff;
background: #ffffff;
border: 1px solid #d0d0d0;
box-shadow: 1px -1px 4px rgba(122, 122, 122, 0.25);
box-shadow: 1px -1px 4px #d0d0d0;
border-radius: 11px;
}

Expand All @@ -85,19 +85,18 @@ $bg-hover-monica: #d7e3ec;

.form-error-message {
border-top: 1px solid #d9534f;
background-color: #f4c8b9;
box-shadow: inset 0 3px 0 0 #d9534f, inset 0 0 0 0 transparent, 0 0 0 1px rgba(63,63,68,.05), 0 1px 3px 0 rgba(63,63,68,.15);
background-color: #f4cecd;
box-shadow: inset 0 3px 0 0 #d9534f, inset 0 0 0 0 transparent, 0 0 0 1px #eeeeee, 0 1px 3px 0 #d0d0d0;
}

.form-information-message {
border-top: 1px solid #47c1bf;
border-top: 1px solid #0366d5;
background-color: #d1ecfa;
box-shadow: inset 0 3px 0 0 #47c1bf, inset 0 0 0 0 transparent, 0 0 0 1px rgba(63,63,68,.05), 0 1px 3px 0 rgba(63,63,68,.15);
box-shadow: inset 0 3px 0 0 #228b22, inset 0 0 0 0 transparent, 0 0 0 1px #eeeeee, 0 1px 3px 0 #d0d0d0;

svg {
width: 20px;
fill: #00848e;
color: #fff;
color: #ffffff;
}
}

Expand All @@ -123,10 +122,10 @@ $bg-hover-monica: #d7e3ec;
}

.boxed {
background: #fff;
background: #ffffff;
border: 1px solid $border-color;
border-radius: 3px;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .05);
box-shadow: 0 1px 3px 0 #eeeeee;
}

.box-padding {
Expand All @@ -139,7 +138,7 @@ $bg-hover-monica: #d7e3ec;
font-size: 75%;
font-weight: 700;
line-height: 1;
color: #fff;
color: #ffffff;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
Expand All @@ -156,16 +155,16 @@ $bg-hover-monica: #d7e3ec;

kbd {
padding:0.1em 0.6em;
border:1px solid #ccc;
border:1px solid #d0d0d0;
font-size:11px;
font-family:Arial,Helvetica,sans-serif;
background-color:#fafafa;
color:#333;
box-shadow:0 1px 0px rgba(0, 0, 0, 0.2),0 0 0 2px #ffffff inset;
color:#313436;
box-shadow:0 1px 0px #999999,0 0 0 2px #ffffff inset;
border-radius:3px;
display:inline-block;
margin:0 0.1em;
text-shadow:0 1px 0 #fff;
text-shadow:0 1px 0 #ffffff;
line-height:1.4;
white-space:nowrap;
}
Expand Down Expand Up @@ -200,7 +199,7 @@ kbd {
width: 100%;
max-width: 700px;
height: 200px;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1) 2%, transparent 2%);
background-image: linear-gradient(to bottom, #d0d0d0 2%, transparent 2%);
background-size: 100% 50px;
background-position: left top;

Expand All @@ -214,7 +213,7 @@ kbd {
span {
margin: 0 1em;
display: block;
background: rgba(#d1ecfa, .75);
background: #d1ecfa;
animation: draw 1s ease-in-out;

&:before{
Expand Down Expand Up @@ -250,12 +249,12 @@ a {

&:hover {
background-color: #0366d5;
color: #fff;
color: #ffffff;
text-decoration: none;
}

&.action-link {
color: #999;
color: #999999;
font-size: 11px;
text-decoration: underline;
margin-right: 5px;
Expand All @@ -266,7 +265,7 @@ a {

&:hover {
background-color: #313436;
color: #eee;
color: #eeeeee;
}
}
}
Expand Down Expand Up @@ -325,7 +324,7 @@ ul {
}

input:disabled {
background-color: #999;
background-color: #999999;
}

.pagination-box {
Expand Down Expand Up @@ -379,7 +378,7 @@ input:disabled {
}

.form-group:not(:last-child) {
border-bottom: 1px solid #eee;
border-bottom: 1px solid #eeeeee;
padding-bottom: 20px;
}

Expand All @@ -392,9 +391,9 @@ input:disabled {
}

.tab-content {
border-right: 1px solid #ddd;
border-left: 1px solid #ddd;
border-bottom: 1px solid #ddd;
border-right: 1px solid #d0d0d0;
border-left: 1px solid #d0d0d0;
border-bottom: 1px solid #d0d0d0;
padding: 15px;
}
}
Expand Down Expand Up @@ -444,9 +443,9 @@ input:disabled {
width: 100%;

.table-row {
border-left: 1px solid #ddd;
border-right: 1px solid #ddd;
border-top: 1px solid #ddd;
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
border-top: 1px solid #d0d0d0;
display: table-row;

&:first-child {
Expand All @@ -460,7 +459,7 @@ input:disabled {
}

&:last-child {
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #d0d0d0;
}

&:hover {
Expand Down Expand Up @@ -504,9 +503,9 @@ input:disabled {
}

.full-page-modal {
background: #fff;
border: 1px solid #eee;
box-shadow: 2px 0px 6px rgba(0, 0, 0, 0.25);
background: #ffffff;
border: 1px solid #eeeeee;
box-shadow: 2px 0px 6px #999999;
border-radius: 12px;

.full-page-modal-year-selector {
Expand All @@ -517,7 +516,7 @@ input:disabled {
}

.full-page-modal-header {
background: #fff;
background: #ffffff;
border-top-left-radius: 12px;
border-top-right-radius: 12px;
}
Expand Down Expand Up @@ -558,7 +557,7 @@ table.vgt-table {
padding: 0px 8px 4px;

&:hover {
box-shadow: 1px 0px 1px rgba(43, 45, 80, 0.16), -1px 1px 1px rgba(43, 45, 80, 0.16), 0px 1px 4px rgba(43, 45, 80, 0.18);
box-shadow: 1px 0px 1px #d0d0d0, -1px 1px 1px #d0d0d0, 0px 1px 4px #d0d0d0;
border-radius: 3px;
}
}
Expand Down Expand Up @@ -620,7 +619,7 @@ footer {
}

.sidebar-blank {
background-color: #fff;
background-color: #ffffff;
border: 0;
}

Expand Down Expand Up @@ -657,7 +656,7 @@ svg {

.form-group-error .error {
border-color: #d9534f !important;
color:#f4c8b9;
color:#f4cecd;
}

// Shake animation
Expand Down
32 changes: 16 additions & 16 deletions resources/sass/buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
background-repeat: repeat-x;
background-position: -1px -1px;
background-size: 110% 110%;
border: 1px solid rgba(27,31,35,0.2);
border: 1px solid #d0d0d0;
border-radius: 0.25em;
-webkit-appearance: none;
-moz-appearance: none;
Expand All @@ -28,20 +28,20 @@

&:hover, &:focus {
text-decoration: none;
background-color: #e5e5e5;
background-image: -webkit-linear-gradient(270deg, #d7e3ec 0%, #e5e5e5 90%);
background-image: linear-gradient(-180deg, #d7e3ec 0%, #e5e5e5 90%);
background-color: #d0d0d0;
background-image: -webkit-linear-gradient(270deg, #d7e3ec 0%, #d0d0d0 90%);
background-image: linear-gradient(-180deg, #d7e3ec 0%, #d0d0d0 90%);
background-position: 0 -0.5em;
background-repeat: repeat-x;
border-color: rgba(27,31,35,0.35);
border-color: #999999;
color: #0366d5;
}

&:active {
background-color: #d0d0d0;
background-image: none;
border-color: rgba(27,31,35,0.35);
box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15)
border-color: #999999;
box-shadow: inset 0 0.15em 0.3em #eeeeee;
}

&:disabled {
Expand All @@ -55,7 +55,7 @@
}

.btn-primary {
color: #fff;
color: #ffffff;
background-color: #228b22;
background-image: -webkit-linear-gradient(270deg, #32cd32 0%, #228b22 90%);
background-image: linear-gradient(-180deg, #32cd32 0%, #228b22 90%);
Expand All @@ -66,18 +66,18 @@
background-image: linear-gradient(-180deg, #32cd32 0%, #228b22 90%);
background-position: 0 -0.5em;
border-color: #228b22;
color: #edd077;
color: #ffd700;
}
}

.btn-danger {
color: #900;
color: #b22222;

&:hover, &:focus {
background-color: #b22222;
background-image: linear-gradient(#d9534f, #b22222);
border-color: #d9534f;
color: #fff;
border-color: #b22222;
color: #ffffff;
}
}

Expand All @@ -87,8 +87,8 @@
&:hover, &:focus {
background-color: #daa520;
background-image: linear-gradient(#fffacd, #daa520);
border-color: #fffacd;
color: #fff;
border-color: #daa520;
color: #ffffff;
}
}

Expand All @@ -102,10 +102,10 @@
}

.small-btn {
background: #fff;
background: #ffffff;
color: #4a4a4a;
opacity: 0.8;
box-shadow: 1px 0px 1px rgba(43, 45, 80, 0.16), -1px 1px 1px rgba(43, 45, 80, 0.16), 0px 1px 4px rgba(43, 45, 80, 0.18);
box-shadow: 1px 0px 1px #d0d0d0, -1px 1px 1px #d0d0d0, 0px 1px 4px #d0d0d0;
border-radius: 11px;
font-weight: 500;
text-decoration: none;
Expand Down
Loading