Skip to content
This repository was archived by the owner on Mar 13, 2023. It is now read-only.

Commit 5c4aec0

Browse files
mckenzieartsmckenziearts
committed
Update website stylesheet
1 parent cc2b3da commit 5c4aec0

File tree

13 files changed

+111
-43
lines changed

13 files changed

+111
-43
lines changed

‎public/assets/application.5e52fac6.css‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎public/assets/application.a84cb0ce.css‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/assets/assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"application":{"js":"/assets/application.a73775a7.js","css":"/assets/application.5e52fac6.css"},"":{"woff":"/assets/chatter.47c9104.woff","eot":"/assets/chatter.367cdc4.eot","png":["/assets/footer-bg.bbcafed.png","/assets/owl.video.play.4a37f80.png"],"jpg":["/assets/banner-bg.797c305.jpg","/assets/slack-bg.3b3462c.jpg"],"ttf":"/assets/chatter.c07dbe6.ttf","svg":"/assets/chatter.424478c.svg","js":"/assets/0.83c9a4fc.js"}}
1+
{"application":{"js":"/assets/application.a73775a7.js","css":"/assets/application.a84cb0ce.css"},"":{"woff":"/assets/chatter.47c9104.woff","eot":"/assets/chatter.367cdc4.eot","png":["/assets/footer-bg.bbcafed.png","/assets/owl.video.play.4a37f80.png"],"jpg":["/assets/banner-bg.797c305.jpg","/assets/slack-bg.3b3462c.jpg"],"ttf":"/assets/chatter.c07dbe6.ttf","svg":"/assets/chatter.424478c.svg","js":"/assets/0.83c9a4fc.js"}}

‎resources/assets/sass/_base.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ ul {
8282
}
8383

8484
.container {
85-
width: 350px;
85+
width: 400px;
8686
@include media-breakpoint-up(md) {
8787
width: 100%;
8888
}

‎resources/assets/sass/_content.scss‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,11 @@
217217
.card.sidebar_card {
218218
h5 {
219219
margin-bottom: 0;
220+
font-size: 1rem;
220221
span {
221222
vertical-align: middle;
222223
display: inline-block;
223-
margin-right: 14px;
224+
margin-right: 10px;
224225
font-size: 26px;
225226
}
226227
}
@@ -235,6 +236,13 @@
235236
}
236237
}
237238

239+
.card.facebook {
240+
.facebook__page {
241+
overflow: hidden;
242+
overflow-x: scroll;
243+
}
244+
}
245+
238246
.card.twitter {
239247
.tweet {
240248
display: grid;
@@ -258,9 +266,11 @@
258266
}
259267
}
260268

261-
@include media-breakpoint-up(lg) {
269+
@include media-breakpoint-up(md) {
262270
display: block;
263271
@include invisible(visible);
272+
273+
264274
}
265275
}
266276

‎resources/assets/sass/_grid.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
grid-column-gap: 16px;
2323
grid-row-gap: 20px;
2424

25+
@include media-breakpoint-up(md) {
26+
grid-template-columns: repeat(2, 1fr);
27+
}
28+
2529
@include media-breakpoint-up(lg) {
2630
grid-template-columns: repeat(3, 1fr);
2731
}

‎resources/assets/sass/_variables.scss‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $white: #fff;
1111
$gray-100: #f5f5f5;
1212
$gray-200: #B2B2B2;
1313
$gray-300: #DEE0DF;
14+
$gray-400: #ced4da;
1415
$gray-900: #525252;
1516
$primary: #00795D;
1617
$primary-200: #668D83;
@@ -45,15 +46,22 @@ $link-hover-decoration: none;
4546
// Define common padding and border radius sizes and more.
4647

4748
$border-radius: 2px;
48-
$border-radius-lg: 2px;
49-
$border-radius-sm: 2px;
49+
$border-radius-lg: $border-radius;
50+
$border-radius-sm: $border-radius;
5051

5152
// Typography
5253
$font-family-sans-serif: "Source Sans Pro", sans-serif;
5354

5455
// Grid containers
5556
//
5657
// Define the maximum width of `.container` for different screen sizes.
58+
$grid-breakpoints: (
59+
xs: 0,
60+
sm: 576px,
61+
md: 720px,
62+
lg: 992px,
63+
xl: 1200px
64+
);
5765

5866
$container-max-widths: (
5967
sm: 350px,
@@ -66,4 +74,21 @@ $container-max-widths: (
6674
//
6775
// Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
6876

77+
$input-border-color: $gray-400;
6978
$input-btn-padding-x: 1.12rem;
79+
$input-box-shadow: none;
80+
$input-btn-focus-box-shadow: none;
81+
$input-focus-border-color: $input-border-color;
82+
83+
// Options
84+
//
85+
// Quickly modify global styling by enabling or disabling optional features.
86+
87+
$enable-caret: true !default;
88+
$enable-rounded: true !default;
89+
$enable-shadows: false;
90+
$enable-gradients: false !default;
91+
$enable-transitions: true !default;
92+
$enable-hover-media-query: false !default; // Deprecated, no longer affects any compiled CSS
93+
$enable-grid-classes: true !default;
94+
$enable-print-styles: true !default;

‎resources/assets/sass/application.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// External libs
2323
@import "libs/owlcarousel/owl.carousel.css";
2424
@import "libs/owlcarousel/owl.theme.default.css";
25-
@import "~highlight.js/styles/dark.css";
25+
@import "~highlight.js/styles/googlecode.css";
2626

2727
// functions
2828
@import "mixins";

‎resources/assets/sass/pages/_forum.scss‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@
180180
.btn{ width:100%; }
181181

182182
ul.nav-pills {
183+
margin-bottom: 20px;
183184
&:before {
184185
content: " ";
185186
display: table;
186187
}
187188
li {
188189
position: relative;
189-
display: block;
190-
width: 100%;
190+
display: inline-block;
191191
margin-top: 5px;
192192
font-size: 18px;
193193
}
@@ -231,6 +231,15 @@
231231
}
232232
}
233233
}
234+
235+
@include media-breakpoint-up(lg) {
236+
ul.nav-pills {
237+
li {
238+
display: block;
239+
width: 100%;
240+
}
241+
}
242+
}
234243
}
235244

236245
.chatter_avatar{
@@ -1283,26 +1292,36 @@ div.mce-edit-area{
12831292
}
12841293

12851294
#chatter_header {
1295+
position: relative;
12861296
background: $primary;
12871297
width: 100%;
12881298
min-height: 80px;
12891299

1300+
&:after {
1301+
content: " ";
1302+
display: table;
1303+
}
1304+
1305+
.container {
1306+
width: 100%;
1307+
}
1308+
12901309
h1 {
1291-
margin-top:0px;
1292-
margin-bottom:0px;
1293-
line-height:80px;
1294-
font-size:24px;
1295-
color:#f1f1f1;
1296-
float:left;
1310+
margin-top: 0;
1311+
margin-bottom: 0;
1312+
line-height: 80px;
1313+
font-size: 24px;
1314+
color: #f1f1f1;
1315+
float: left;
12971316
}
12981317

12991318
span{
1300-
float:right;
1301-
line-height:80px;
1302-
margin-left:10px;
1303-
color:#ccc;
1304-
color:rgba(255, 255, 255, 0.85);
1305-
font-size:12px;
1319+
float: right;
1320+
line-height: 80px;
1321+
margin-left: 10px;
1322+
color: #ccc;
1323+
color: rgba(255, 255, 255, 0.85);
1324+
font-size: 12px;
13061325
}
13071326

13081327
a.chatter_cat{
@@ -1315,7 +1334,7 @@ div.mce-edit-area{
13151334
}
13161335
}
13171336

1318-
a.back_btn{
1337+
a.back_btn {
13191338
float: left;
13201339
line-height: 40px;
13211340
font-size: 15px;
@@ -1345,6 +1364,4 @@ div.mce-edit-area{
13451364
left:-1px;
13461365
}
13471366
}
1348-
1349-
13501367
}

‎resources/assets/sass/pages/_login.scss‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,20 @@
1010
padding-bottom: 20px;
1111
margin-bottom: 60px;
1212
border-bottom: 1px solid $gray-900;
13+
font-size: 1.5rem;
1314
}
1415

15-
.btn-link.first {
16-
padding-left: 0;
16+
a.btn-link {
17+
padding: 0;
18+
margin-right: 5px;
19+
}
20+
}
21+
22+
@include media-breakpoint-up(lg) {
23+
.card {
24+
.card__title {
25+
font-size: 2rem;
26+
}
1727
}
1828
}
1929
}

0 commit comments

Comments
 (0)