mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update compiled assets

This commit is contained in:
Daniel Supernault 2018-04-15 19:35:11 -06:00
parent a13cdefa8c
commit 307e227ed5
5 changed files with 309 additions and 11776 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
public/css/app.css vendored
View File

@ -1,4 +1,4 @@
@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);/*!
@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,600);/*!
* Bootstrap v4.1.0 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
@ -32,7 +32,7 @@
--breakpoint-md: 768px;
--breakpoint-lg: 992px;
--breakpoint-xl: 1200px;
--font-family-sans-serif: "Raleway", sans-serif;
--font-family-sans-serif: "Roboto", sans-serif;
--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}
@ -72,8 +72,8 @@ section {
body {
margin: 0;
font-family: "Raleway", sans-serif;
font-size: 0.9rem;
font-family: "Roboto", sans-serif;
font-size: 1rem;
font-weight: 400;
line-height: 1.6;
color: #212529;
@ -399,36 +399,36 @@ h6,
h1,
.h1 {
font-size: 2.25rem;
font-size: 2.5rem;
}
h2,
.h2 {
font-size: 1.8rem;
font-size: 2rem;
}
h3,
.h3 {
font-size: 1.575rem;
font-size: 1.75rem;
}
h4,
.h4 {
font-size: 1.35rem;
font-size: 1.5rem;
}
h5,
.h5 {
font-size: 1.125rem;
font-size: 1.25rem;
}
h6,
.h6 {
font-size: 0.9rem;
font-size: 1rem;
}
.lead {
font-size: 1.125rem;
font-size: 1.25rem;
font-weight: 300;
}
@ -500,7 +500,7 @@ mark,
.blockquote {
margin-bottom: 1rem;
font-size: 1.125rem;
font-size: 1.25rem;
}
.blockquote-footer {
@ -2229,7 +2229,7 @@ pre code {
display: block;
width: 100%;
padding: 0.375rem 0.75rem;
font-size: 0.9rem;
font-size: 1rem;
line-height: 1.6;
color: #495057;
background-color: #fff;
@ -2290,7 +2290,7 @@ pre code {
}
select.form-control:not([size]):not([multiple]) {
height: calc(2.19rem + 2px);
height: calc(2.35rem + 2px);
}
select.form-control:focus::-ms-value {
@ -2315,14 +2315,14 @@ select.form-control:focus::-ms-value {
.col-form-label-lg {
padding-top: calc(0.5rem + 1px);
padding-bottom: calc(0.5rem + 1px);
font-size: 1.125rem;
font-size: 1.25rem;
line-height: 1.5;
}
.col-form-label-sm {
padding-top: calc(0.25rem + 1px);
padding-bottom: calc(0.25rem + 1px);
font-size: 0.7875rem;
font-size: 0.875rem;
line-height: 1.5;
}
@ -2362,7 +2362,7 @@ select.form-control:focus::-ms-value {
.input-group-sm > .input-group-prepend > .btn,
.input-group-sm > .input-group-append > .btn {
padding: 0.25rem 0.5rem;
font-size: 0.7875rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
@ -2373,7 +2373,7 @@ select.form-control-sm:not([size]):not([multiple]),
.input-group-sm > .input-group-append > select.input-group-text:not([size]):not([multiple]),
.input-group-sm > .input-group-prepend > select.btn:not([size]):not([multiple]),
.input-group-sm > .input-group-append > select.btn:not([size]):not([multiple]) {
height: calc(1.68125rem + 2px);
height: calc(1.8125rem + 2px);
}
.form-control-lg,
@ -2383,7 +2383,7 @@ select.form-control-sm:not([size]):not([multiple]),
.input-group-lg > .input-group-prepend > .btn,
.input-group-lg > .input-group-append > .btn {
padding: 0.5rem 1rem;
font-size: 1.125rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem;
}
@ -2394,7 +2394,7 @@ select.form-control-lg:not([size]):not([multiple]),
.input-group-lg > .input-group-append > select.input-group-text:not([size]):not([multiple]),
.input-group-lg > .input-group-prepend > select.btn:not([size]):not([multiple]),
.input-group-lg > .input-group-append > select.btn:not([size]):not([multiple]) {
height: calc(2.6875rem + 2px);
height: calc(2.875rem + 2px);
}
.form-group {
@ -2804,7 +2804,7 @@ select.form-control-lg:not([size]):not([multiple]),
user-select: none;
border: 1px solid transparent;
padding: 0.375rem 0.75rem;
font-size: 0.9rem;
font-size: 1rem;
line-height: 1.6;
border-radius: 0.25rem;
-webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
@ -3521,7 +3521,7 @@ fieldset:disabled a.btn {
.btn-lg,
.btn-group-lg > .btn {
padding: 0.5rem 1rem;
font-size: 1.125rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem;
}
@ -3529,7 +3529,7 @@ fieldset:disabled a.btn {
.btn-sm,
.btn-group-sm > .btn {
padding: 0.25rem 0.5rem;
font-size: 0.7875rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
@ -3618,7 +3618,7 @@ input[type="button"].btn-block {
min-width: 10rem;
padding: 0.5rem 0;
margin: 0.125rem 0 0;
font-size: 0.9rem;
font-size: 1rem;
color: #212529;
text-align: left;
list-style: none;
@ -3783,7 +3783,7 @@ input[type="button"].btn-block {
display: block;
padding: 0.5rem 1.5rem;
margin-bottom: 0;
font-size: 0.7875rem;
font-size: 0.875rem;
color: #6c757d;
white-space: nowrap;
}
@ -4062,7 +4062,7 @@ input[type="button"].btn-block {
align-items: center;
padding: 0.375rem 0.75rem;
margin-bottom: 0;
font-size: 0.9rem;
font-size: 1rem;
font-weight: 400;
line-height: 1.6;
color: #495057;
@ -4221,7 +4221,7 @@ input[type="button"].btn-block {
.custom-select {
display: inline-block;
width: 100%;
height: calc(2.19rem + 2px);
height: calc(2.35rem + 2px);
padding: 0.375rem 1.75rem 0.375rem 0.75rem;
line-height: 1.6;
color: #495057;
@ -4264,14 +4264,14 @@ input[type="button"].btn-block {
}
.custom-select-sm {
height: calc(1.68125rem + 2px);
height: calc(1.8125rem + 2px);
padding-top: 0.375rem;
padding-bottom: 0.375rem;
font-size: 75%;
}
.custom-select-lg {
height: calc(2.6875rem + 2px);
height: calc(2.875rem + 2px);
padding-top: 0.375rem;
padding-bottom: 0.375rem;
font-size: 125%;
@ -4281,7 +4281,7 @@ input[type="button"].btn-block {
position: relative;
display: inline-block;
width: 100%;
height: calc(2.19rem + 2px);
height: calc(2.35rem + 2px);
margin-bottom: 0;
}
@ -4289,7 +4289,7 @@ input[type="button"].btn-block {
position: relative;
z-index: 2;
width: 100%;
height: calc(2.19rem + 2px);
height: calc(2.35rem + 2px);
margin: 0;
opacity: 0;
}
@ -4314,7 +4314,7 @@ input[type="button"].btn-block {
right: 0;
left: 0;
z-index: 1;
height: calc(2.19rem + 2px);
height: calc(2.35rem + 2px);
padding: 0.375rem 0.75rem;
line-height: 1.6;
color: #495057;
@ -4330,7 +4330,7 @@ input[type="button"].btn-block {
bottom: 0;
z-index: 3;
display: block;
height: calc(calc(2.19rem + 2px) - 1px * 2);
height: calc(calc(2.35rem + 2px) - 1px * 2);
padding: 0.375rem 0.75rem;
line-height: 1.6;
color: #495057;
@ -4586,10 +4586,10 @@ input[type="button"].btn-block {
.navbar-brand {
display: inline-block;
padding-top: 0.32rem;
padding-bottom: 0.32rem;
padding-top: 0.3rem;
padding-bottom: 0.3rem;
margin-right: 1rem;
font-size: 1.125rem;
font-size: 1.25rem;
line-height: inherit;
white-space: nowrap;
}
@ -4641,7 +4641,7 @@ input[type="button"].btn-block {
.navbar-toggler {
padding: 0.25rem 0.75rem;
font-size: 1.125rem;
font-size: 1.25rem;
line-height: 1;
background-color: transparent;
border: 1px solid transparent;
@ -5434,7 +5434,7 @@ input[type="button"].btn-block {
.pagination-lg .page-link {
padding: 0.75rem 1.5rem;
font-size: 1.125rem;
font-size: 1.25rem;
line-height: 1.5;
}
@ -5450,7 +5450,7 @@ input[type="button"].btn-block {
.pagination-sm .page-link {
padding: 0.25rem 0.5rem;
font-size: 0.7875rem;
font-size: 0.875rem;
line-height: 1.5;
}
@ -5623,7 +5623,7 @@ input[type="button"].btn-block {
}
.alert-dismissible {
padding-right: 3.85rem;
padding-right: 4rem;
}
.alert-dismissible .close {
@ -5772,7 +5772,7 @@ input[type="button"].btn-block {
display: flex;
height: 1rem;
overflow: hidden;
font-size: 0.675rem;
font-size: 0.75rem;
background-color: #e9ecef;
border-radius: 0.25rem;
}
@ -6049,7 +6049,7 @@ input[type="button"].btn-block {
.close {
float: right;
font-size: 1.35rem;
font-size: 1.5rem;
font-weight: 700;
line-height: 1;
color: #000;
@ -6260,7 +6260,7 @@ button.close {
z-index: 1070;
display: block;
margin: 0;
font-family: "Raleway", sans-serif;
font-family: "Roboto", sans-serif;
font-style: normal;
font-weight: 400;
line-height: 1.6;
@ -6274,7 +6274,7 @@ button.close {
word-spacing: normal;
white-space: normal;
line-break: auto;
font-size: 0.7875rem;
font-size: 0.875rem;
word-wrap: break-word;
opacity: 0;
}
@ -6385,7 +6385,7 @@ button.close {
z-index: 1060;
display: block;
max-width: 276px;
font-family: "Raleway", sans-serif;
font-family: "Roboto", sans-serif;
font-style: normal;
font-weight: 400;
line-height: 1.6;
@ -6399,7 +6399,7 @@ button.close {
word-spacing: normal;
white-space: normal;
line-break: auto;
font-size: 0.7875rem;
font-size: 0.875rem;
word-wrap: break-word;
background-color: #fff;
background-clip: padding-box;
@ -6561,7 +6561,7 @@ button.close {
.popover-header {
padding: 0.5rem 0.75rem;
margin-bottom: 0;
font-size: 0.9rem;
font-size: 1rem;
color: inherit;
background-color: #f7f7f7;
border-bottom: 1px solid #ebebeb;

11976
public/js/app.js vendored
View File

File diff suppressed because it is too large Load Diff

4
resources/assets/sass/_variables.scss vendored
View File

@ -3,6 +3,6 @@
$body-bg: #f5f8fa;
// Typography
$font-family-sans-serif: "Raleway", sans-serif;
$font-size-base: 0.9rem;
$font-family-sans-serif: "Roboto", sans-serif;
$font-size-base: 1rem;
$line-height-base: 1.6;

7
resources/assets/sass/app.scss vendored
View File

@ -1,6 +1,6 @@
// Fonts
@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,600");
// Variables
@import "variables";
@ -8,7 +8,4 @@
// Bootstrap
@import '~bootstrap/scss/bootstrap';
.navbar-laravel {
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}
@import "custom";

4
resources/assets/sass/custom.scss vendored Normal file
View File

@ -0,0 +1,4 @@
.navbar-laravel {
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}