Skip to content

Commit

Permalink
style(css): Update style
Browse files Browse the repository at this point in the history
  • Loading branch information
setmao committed Feb 27, 2022
1 parent 05b3611 commit 37e1313
Show file tree
Hide file tree
Showing 16 changed files with 669 additions and 45 deletions.
4 changes: 2 additions & 2 deletions src/static/css/base/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
.dropdown,
.dropdown.open {
> .btn {
color: #502526; //2020
color: #323166; //2022
//color: $dropdown-link-color; ~2019
border-radius: 3px;
&,
Expand All @@ -145,7 +145,7 @@
font-size: 13px;
> li > a {
padding: 5px 10px;
color: #502526; //2020
color: #323166; //2022
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/static/css/base/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
margin-top: 6px !important;
}

.m-t-5 {
margin-top: 15px !important;
}
1 change: 1 addition & 0 deletions src/static/css/components/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

.form-tip {
vertical-align: middle;
color: #FFFFFF;
}


Expand Down
17 changes: 11 additions & 6 deletions src/static/css/pages/_dashboard.scss
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
.dashboard{
.navbar-site{
background-color: #502526; //2020
.dashboard {
color: #FFFFFF;
.navbar-site {
background-color: #323166; //2022
.navbar-brand{
padding-right: 5px;
}
}
}

.dashboard-link {
color: #C386AE;
}

.dashboard-header {
padding: 20px 33px;
min-height: 65px;
margin: 0;
border-bottom: 1px solid #f8f8f8;
border-bottom: 1px solid #323166;
font-size:21px;
font-weight: 500;
color:#4A4A4A;
color:#AFAEE6;
line-height:24px;

text-overflow: ellipsis;
overflow: hidden;

> .header__title {
margin-right: 24px;
color: #502526;
color: #AFAEE6;
}

.btn {
Expand Down
27 changes: 14 additions & 13 deletions src/static/css/pages/_proposals.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
body.dashboard{
font-weight: 400;
background: #FBD9CA;
background: #1A1A30;
background-image: url(/static/pycontw-2022/assets/bg-dashboard.svg);

p.welcome{
font-size: 21px;
color: #4A4A4A;
color: #AFAEE6;
line-height: 24px;
margin: 35px 0 20px 5px;
}
Expand All @@ -17,13 +18,13 @@ body.dashboard{
padding: 24px 0 0 28px;
height: 65px;
font-size:16px;
color: #BBBBBB;
color: #AFAEE6;
line-height:19px;
border-left: 4px solid #FFFFFF;
border-bottom: 1px solid #EEEEEE;
border-left: 4px solid #323166;
border-bottom: 1px solid #323166;

&:hover{
color: #502526; //2020
color: #323166; //2022
//color:#BBBBBB; ~2019
background-color: #F8F8F8;
border-left: 4px solid #F8F8F8;
Expand All @@ -41,9 +42,9 @@ body.dashboard{
}
}
&.active a{
color: #502526; //2020
color: #C386AE; //2022
//color:#3E6DF5; ~2019
border-left: 4px solid #502526; //2020
border-left: 4px solid #C386AE; //2022
//border-left: 4px solid #3E6DF5; ~2019
// &:hover{
// color:#BBBBBB;
Expand All @@ -69,16 +70,16 @@ body.dashboard{
}
}
.main-container{
background:#FFFFFF;
border: 1px solid #EEEEEE;
background:#46467A;
border: 1px solid #323166;
border-radius:4px;
margin-bottom: 20px;

.main {
min-height: 712px;
border-left-style: solid;
border-left-width: 1px;
border-left-color: #EEEEEE;
border-left-color: #323166;
padding: 0;

.table-panel {
Expand Down Expand Up @@ -143,7 +144,7 @@ body.dashboard{
}
.markdown-field {
background-color: transparent;
border: 1px solid #ddd;
border: 1px solid #323166;
border-radius: 4px;
position: relative;
padding: 1em;
Expand Down Expand Up @@ -293,7 +294,7 @@ body.dashboard{

.field_title {
font-size: 16px;
color: #4A4A4A;
color: #FFFFFF;
line-height: 19px;
font-weight: normal;
}
Expand Down
14 changes: 7 additions & 7 deletions src/static/css/pages/_registration.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
.registration-panel {
padding: 40px 10%;
//background-color: #fff; ~2019
background-color: #F4AF9E; //2020
background-color: #46467A; //2022
box-shadow: 0 2px 4px 0 rgba(0,0,0,.3);
border-radius: 4px;

&__title {
//color: $theme-color; ~2019
color: #502526; //2020
color: #FFFFFF; //2022
text-align: center;
margin-top: 0;
margin-bottom: 30px;
Expand All @@ -23,9 +23,9 @@
}

.registration-panel .btn-primary {
background-color: #502526; //2020
border-color: #502526; //2020
color: #FBD9CA; //2020
background-color: #8280DC; //2022
border-color: #8280DC; //2022
color: #FFFFFF; //2020
&:active,
&:focus,
&:hover {
Expand All @@ -36,11 +36,11 @@
}

.registration-panel .form-group .controls .form-control{
border-color: #502526; //2020
border-color: #323166; //2022
}

.registration-panel .btn-link{
color: #502526; //2020
color: #8690E5; //2022
}

// Styles specific to PyCon TW 2016.
Expand Down
4 changes: 2 additions & 2 deletions src/static/css/vendors/bootstrap/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,10 @@
border-color: $navbar-default-border;

.navbar-brand {
color: $navbar-default-brand-color;
color: #C386AE;
&:hover,
&:focus {
color: $navbar-default-brand-hover-color;
color: #C386AE;
background-color: $navbar-default-brand-hover-bg;
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/static/pycontw-2022/assets/2022-py-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 37e1313

Please sign in to comment.