Skip to content
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.

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

Fix 133 #355

Merged
merged 63 commits into from
Oct 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
40ac9a6
Fix user profile title
alexandermendes Sep 26, 2017
473ce20
Merge pull request #336 from LibCrowds/dev
alexandermendes Sep 27, 2017
dc83009
Change card-block to card-body
alexandermendes Sep 29, 2017
ef438a3
Change bg-faded to bg-light
alexandermendes Sep 29, 2017
645ea63
Upgrade to bootstrap 4 beta
alexandermendes Sep 29, 2017
3502df3
Replace tether with popper
alexandermendes Sep 29, 2017
7d6c5ee
Move to bootstrap-vue 1.0.0-beta.9
alexandermendes Sep 29, 2017
977c379
Replace gray-<shade> with gray-<number>
alexandermendes Sep 29, 2017
5a84654
Repace $spacer
alexandermendes Sep 29, 2017
8d53ff9
Fix accidental paste
alexandermendes Sep 29, 2017
ed03f1e
Change $font-size-h3 to h3-font-size
alexandermendes Sep 29, 2017
d91cdbc
Remove $font-size-xs
alexandermendes Sep 29, 2017
9fe3c02
Remove $nav-item-inline-spacer
alexandermendes Sep 29, 2017
ad6d80e
More gray fixes
alexandermendes Sep 29, 2017
261e565
Rplace brand colors
alexandermendes Sep 29, 2017
ffef33c
Fix button outline-light hover
alexandermendes Sep 29, 2017
b507d47
Move to d-* utils
alexandermendes Sep 29, 2017
39bec1f
Rearrange landing page stats
alexandermendes Sep 29, 2017
4b03192
Remove secondary buttons
alexandermendes Sep 29, 2017
912f9cc
Fix tooltips
alexandermendes Sep 29, 2017
858450b
Merge master
alexandermendes Sep 29, 2017
7f37ee0
Fix merge conflicts
alexandermendes Sep 29, 2017
0c73a95
Remove $font-size-xs
alexandermendes Sep 29, 2017
b0fb32e
Change card no-block to no-body
alexandermendes Sep 29, 2017
953f253
Remove unecessary v-binds
alexandermendes Sep 29, 2017
b73fe7c
Update floating tab nav
alexandermendes Sep 30, 2017
27c5180
Fix spacing on microsite homepage
alexandermendes Sep 30, 2017
bc9dbc4
Fix microsite hero logo alignment
alexandermendes Sep 30, 2017
09081c5
Remove whitespace
alexandermendes Sep 30, 2017
e3b11ad
Home page layout fixes
alexandermendes Sep 30, 2017
601ca1b
Change b-button to b-btn
alexandermendes Sep 30, 2017
658296a
Fix stats button
alexandermendes Sep 30, 2017
31f61ce
Remove modal cancel buttons
alexandermendes Sep 30, 2017
c41e65b
Fix app navbar height
alexandermendes Sep 30, 2017
4e9da6f
Fix table display prop (re #354)
alexandermendes Sep 30, 2017
e9e9322
Change offset-* to m-*
alexandermendes Sep 30, 2017
e02e76d
Centralise social sign in buttons
alexandermendes Sep 30, 2017
f65c8f3
Fix leaderboard button alignment
alexandermendes Sep 30, 2017
18d9ed2
Add display: table (re #354)
alexandermendes Sep 30, 2017
c447214
Fix collection navbar styles
alexandermendes Sep 30, 2017
126009d
Fix collection navbar
alexandermendes Sep 30, 2017
786d4ed
Fix app nav dropdown
alexandermendes Sep 30, 2017
4c40c90
Remove alt tags from thumbnails/avatars
alexandermendes Sep 30, 2017
f68d47b
Add margin to stat
alexandermendes Sep 30, 2017
5901ef7
Add styles
alexandermendes Sep 30, 2017
7ffef43
Update $gray-100
alexandermendes Oct 1, 2017
fbebb4c
Update padding
alexandermendes Oct 1, 2017
e1dc62b
Remove unused scss vars
alexandermendes Oct 1, 2017
725beb4
Clean up bootstrap scss vars
alexandermendes Oct 1, 2017
8ddc4f0
Fix leaderboard button position
alexandermendes Oct 1, 2017
931874a
Update button padding
alexandermendes Oct 1, 2017
8222aa5
Add size to social media buttons
alexandermendes Oct 1, 2017
ad87545
Update learn more button margin
alexandermendes Oct 1, 2017
500371c
Fix inverse/dark navbar
alexandermendes Oct 1, 2017
58364a1
Fix default size for social media buttons
alexandermendes Oct 1, 2017
d78329a
Fix default size for project contrib button
alexandermendes Oct 1, 2017
fb3d9b1
Remove unused layout
alexandermendes Oct 1, 2017
20e0e5c
Use data var for collectionName
alexandermendes Oct 1, 2017
580f8f5
Remove broken native flag
alexandermendes Oct 1, 2017
e6aa1fb
Improve open project table styles
alexandermendes Oct 1, 2017
1f67786
Update nested list choosers
alexandermendes Oct 1, 2017
f320f9f
Fix for overflowing cards
alexandermendes Oct 1, 2017
93fe334
Tidy up admin tables
alexandermendes Oct 1, 2017
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
37 changes: 12 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
},
"dependencies": {
"axios": "^0.16.1",
"bootstrap": "4.0.0-alpha.6",
"bootstrap-vue": "^0.21.0",
"bootstrap": "4.0.0-beta",
"bootstrap-vue": "^1.0.0-beta.9",
"chartist": "^0.11.0",
"chartist-plugin-legend": "^0.6.2",
"chartist-plugin-tooltips": "0.0.17",
Expand All @@ -34,12 +34,12 @@
"moment": "^2.18.1",
"pluralize": "^7.0.0",
"pnotify": "^3.2.1",
"popper.js": "^1.12.5",
"progressbar.js": "^1.0.1",
"raven-js": "^3.17.0",
"scrollreveal": "^3.3.6",
"spinkit": "^1.2.5",
"sweetalert2": "^6.9.0",
"tether": "^1.4.0",
"vue": "^2.4.2",
"vue-analytics": "^4.2.2",
"vue-awesome": "^2.3.1",
Expand Down
73 changes: 33 additions & 40 deletions src/assets/style/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,65 +8,61 @@ $headings-font-weight: 400;
$line-height-base: 1.6;

/* Colors */
$brand-primary: #D00000;
$brand-success: #408E40;
$brand-info: #2589BD;
$brand-warning: #E38D13;
$brand-danger: #E4572E;
$brand-inverse: #111111;
$body-color: #26333F;
$blue: #2589BD !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$pink: #e83e8c !default;
$red: #D00000 !default;
$orange: #E38D13 !default;
$yellow: #ffc107 !default;
$green: #408E40 !default;
$teal: #20c997 !default;
$cyan: #03B5AA !default;

$body-color: #202B35;

$gray-100: #f7f7f7;
$gray-1000: #1A1D21;
$gray-1100: #14171A;
$gray-1200: #0D1012;

$grays: (
"1000": $gray-1000,
"1100": $gray-1100,
"1200": $gray-1200
);

$white: #FFFFFF;
$gray: #404446;
$gray-light: #888888;
$black: #000000;
$twitter: #00ACEE;
$facebook: #3B5998;
$googleplus: #D34836;
$linkedin: #0E76A8;

/* Links */
$link-color: #03B5AA;
$link-color: $cyan;
$link-hover-color: darken($link-color, 5%);
$link-hover-decoration: underline;

/* Components */
$component-active-bg: $brand-info;

/* Buttons */
$btn-secondary-color: $brand-inverse;
$btn-secondary-bg: $white;
$btn-secondary-border: $brand-inverse;
$btn-border-radius: 0px;
$btn-border-radius-lg: 0px;
$btn-border-radius-sm: 0px;

/* Navbar */
/* Navbars */
$navbar-light-color: rgba($black, .7);
$navbar-inverse-color: $white;
$navbar-inverse-toggler-border: none;
$app-navbar-height: 50px;

/* Nav Pills*/
$nav-pills-active-link-bg: transparent;

/* Input */
$input-padding-x: 1.25rem;
$input-padding-y: .75rem;
$input-border-focus: $brand-info;
$custom-select-focus-border-color: lighten($brand-info, 25%);
$navbar-dark-color: $white;
$navbar-dark-toggler-border-color: transparent;

/* Tables */
$table-cell-padding: .75rem 1.25rem;
$table-bg-accent: darken($white, 3%);
$table-bg-hover: darken($white, 5%);
$table-border-color: rgba($black, .075);
$table-accent-bg: darken($white, 3%);
$table-hover-bg: darken($white, 5%);

/* Pagination */
$pagination-color: $brand-info;
$pagination-hover-color: darken($brand-info, 10%);
$pagination-active-bg: $brand-info;
$pagination-active-border: $brand-info;
$pagination-color: $blue;
$pagination-hover-color: darken($blue, 10%);

/* Cards */
$card-border-radius: 0px;
Expand All @@ -75,9 +71,6 @@ $card-columns-count: 2;
/* Alerts */
$alert-border-radius: 0;

/* Forms */
$form-group-margin-bottom: 1rem;

/* List Groups */
$list-group-border-radius: 0px;
$list-group-item-padding-y: 0.5rem;
Expand All @@ -90,7 +83,7 @@ $spacer: 2.5rem;
$modal-backdrop-opacity: 0.8;
$modal-inner-padding: 0;
$modal-dialog-margin-y-sm-up: 50px;
$modal-backdrop-bg: #EFEFEF;
$modal-backdrop-bg: $gray-100;

/* Hamburger */
$hamburger-hover-opacity: 100%;
Expand All @@ -104,7 +97,7 @@ $lg-path-fonts: '~lightgallery/src/fonts';
$lg-path-images: '~lightgallery/src/img';

/* SpinKit */
$spinkit-spinner-color: $brand-info;
$spinkit-spinner-color: $blue;

/* Chartist */
$ct-series-colors:
Expand Down
4 changes: 4 additions & 0 deletions src/assets/style/partials/_cards.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.card {
.card-body {
overflow-y: auto;
}

.card-header {
font-family: $headings-font-family;
background-color: $white;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/style/partials/_tables.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.table {
display: table;
font-size: $font-size-sm;
margin-bottom: 0;
background-color: $white;
border: $table-border-width solid $table-border-color;
display: block;
overflow-y: auto;

th {
Expand Down
8 changes: 4 additions & 4 deletions src/components/PreviewCard.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<b-card
class="preview-card"
:header="'Preview'">
header="Preview">
<b-card>
<div
v-for="(field, index) in previewFields"
Expand Down Expand Up @@ -78,7 +78,7 @@ export default {
@import 'src/assets/style/main';

.preview-card {
@extend .bg-faded;
@extend .bg-light;

* {
&:not(:last-child) {
Expand All @@ -95,13 +95,13 @@ export default {
font-family: $font-family-base;
font-weight: 600;
text-transform: uppercase;
color: $gray-dark;
color: $gray-1000;
}

.info {
font-size: $font-size-sm;
font-style: italic;
color: $gray-light;
color: $gray-600;
}
}
</style>
Expand Down
2 changes: 1 addition & 1 deletion src/components/buttons/ProjectContrib.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default {
},
size: {
type: String,
default: 'md'
default: ''
},
variant: {
type: String,
Expand Down
24 changes: 16 additions & 8 deletions src/components/buttons/SocialMedia.vue
Original file line number Diff line number Diff line change
@@ -1,37 +1,41 @@
<template>
<div class="social-media-buttons">

<b-tooltip content="Share on Facebook" triggers="hover">
<b-btn
v-b-tooltip
title="Share on Facebook"
variant="facebook"
:size="size"
@click="share(facebookUrl, 980, 620)">
<icon name="facebook"></icon>
</b-btn>
</b-tooltip>

<b-tooltip content="Share on Twitter" triggers="hover">
<b-btn
v-b-tooltip
title="Share on Twitter"
variant="twitter"
:size="size"
@click="share(twitterUrl, 450, 550)">
<icon name="twitter"></icon>
</b-btn>
</b-tooltip>

<b-tooltip content="Share on Google Plus" triggers="hover">
<b-btn
v-b-tooltip
title="Share on Google Plus"
variant="googleplus"
:size="size"
@click="share(googleplusUrl, 510, 725)">
<icon name="google-plus"></icon>
</b-btn>
</b-tooltip>

<b-tooltip content="Share on LinkedIn" triggers="hover">
<b-btn
v-b-tooltip
title="Share on LinkedIn"
variant="linkedin"
:size="size"
@click="share(linkedinUrl, 510, 520)">
<icon name="linkedin"></icon>
</b-btn>
</b-tooltip>

</div>
</template>
Expand Down Expand Up @@ -63,6 +67,10 @@ export default {
tweet: {
type: String,
default: `Crowdsourcing from ${siteConfig.company}`
},
size: {
type: String,
default: ''
}
},

Expand Down
Loading