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.

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

1.0.0 #12

Merged
merged 18 commits into from
Jul 3, 2024
Merged

1.0.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c0102ad
Upgraded to Bootstrap 4
bklaing2 Jun 7, 2024
37d363c
Updated image styles
bklaing2 Jun 7, 2024
7411bbf
Updated tables
bklaing2 Jun 7, 2024
c85a0f9
Updated forms
bklaing2 Jun 7, 2024
1a997eb
Updated buttons
bklaing2 Jun 7, 2024
9076465
Updated dropdowns
bklaing2 Jun 7, 2024
3fea23b
Updated grid
bklaing2 Jun 7, 2024
c51a54d
Updated nav
bklaing2 Jun 24, 2024
cbf33d3
Updated Navbar
bklaing2 Jun 24, 2024
1cc5036
Updated Pagination
bklaing2 Jun 24, 2024
9a7f4f0
Updated Labels and Badges
bklaing2 Jun 24, 2024
11da6e7
Updated Panels
bklaing2 Jun 24, 2024
7693ac7
Updated Progress
bklaing2 Jun 24, 2024
a46cc6e
Updated Carousel
bklaing2 Jun 24, 2024
de29964
Updated Utilities
bklaing2 Jun 24, 2024
474f29b
Bump Bootstrap version in comment
bklaing2 Jun 24, 2024
33cf28d
Bumped version number
bklaing2 Jun 25, 2024
e880218
Delete assets directory
bklaing2 Jul 3, 2024
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
12,218 changes: 7,134 additions & 5,084 deletions dist/stylesheets/doi.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stylesheets/doi.css.map
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions dist/stylesheets/doi.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stylesheets/doi.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "maltipoo",
"version": "0.0.1",
"version": "1.0.0",
"description": "Base stylesheet for DataCite",
"scripts": {
"clean": "rimraf dist",
Expand All @@ -10,6 +10,7 @@
"repository": "https://github.com/datacite/maltipoo",
"license": "MIT",
"devDependencies": {
"bootstrap": "4",
"bootstrap-sass": "^3.4.3",
"cssnano": "^7.0.1",
"postcss": "^8.4.38",
Expand Down
83 changes: 43 additions & 40 deletions src/stylesheets/doi.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,60 @@
/*
Datacite - Bootstrap 3 theme
Datacite - Bootstrap 4 theme
---------------------------------------------*/

@import "variables.scss";

// Core variables and mixins
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
@import "../../node_modules/bootstrap/scss/functions";
@import "../../node_modules/bootstrap/scss/variables";
@import "../../node_modules/bootstrap/scss/mixins";

// Reset and dependencies
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/print";
// @import "../../node_modules/bootstrap/scss/normalize";
@import "../../node_modules/bootstrap/scss/print";
// @import "bootstrap/glyphicons";

// Core CSS
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/code";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/buttons";
// @import "../../node_modules/bootstrap/scss/scaffolding";
@import "../../node_modules/bootstrap/scss/type";
@import "../../node_modules/bootstrap/scss/code";
@import "../../node_modules/bootstrap/scss/grid";
@import "../../node_modules/bootstrap/scss/tables";
@import "../../node_modules/bootstrap/scss/forms";
@import "../../node_modules/bootstrap/scss/buttons";

// Components
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/navs";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/navbar";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pagination";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pager";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/badges";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/alerts";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/close";
// @import "../../node_modules/bootstrap/scss/component-animations";
@import "../../node_modules/bootstrap/scss/dropdown";
@import "../../node_modules/bootstrap/scss/button-group";
@import "../../node_modules/bootstrap/scss/input-group";
@import "../../node_modules/bootstrap/scss/nav";
@import "../../node_modules/bootstrap/scss/navbar";
@import "../../node_modules/bootstrap/scss/breadcrumb";
@import "../../node_modules/bootstrap/scss/pagination";
// @import "../../node_modules/bootstrap/scss/pager";
// @import "../../node_modules/bootstrap/scss/labels";
@import "../../node_modules/bootstrap/scss/badge";
@import "../../node_modules/bootstrap/scss/jumbotron";
// @import "../../node_modules/bootstrap/scss/thumbnails";
@import "../../node_modules/bootstrap/scss/alert";
@import "../../node_modules/bootstrap/scss/progress";
@import "../../node_modules/bootstrap/scss/media";
@import "../../node_modules/bootstrap/scss/list-group";
// @import "../../node_modules/bootstrap/scss/panels";
// @import "../../node_modules/bootstrap/scss/responsive-embed";
// @import "../../node_modules/bootstrap/scss/wells";
@import "../../node_modules/bootstrap/scss/close";

// Components w/ JavaScript
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/popovers";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/carousel";
@import "../../node_modules/bootstrap/scss/modal";
@import "../../node_modules/bootstrap/scss/tooltip";
@import "../../node_modules/bootstrap/scss/popover";
@import "../../node_modules/bootstrap/scss/carousel";

// Utility classes
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
@import "../../node_modules/bootstrap/scss/utilities";
// @import "../../node_modules/bootstrap/scss/responsive-utilities";

// Globals
@import "doi/globals/colors";
Expand Down Expand Up @@ -98,4 +101,4 @@ Datacite - Bootstrap 3 theme
@import "doi/pages/stats-portal";
@import "doi/pages/metadata";
@import "doi/pages/doi";
@import "doi/pages/repository-finder";
@import "doi/pages/repository-finder"
14 changes: 7 additions & 7 deletions src/stylesheets/doi/components/_alerts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ category: Components
}
}

.text-primary, .text-findable, .panel-footer .text-findable {
.text-primary, .text-findable, .card-footer .text-findable {
color: $primary-color;
}
.text-default, .text-inactive, .panel-footer .text-inactive {
.text-default, .text-inactive, .card-footer .text-inactive {
color: $default-color;
}
.text-info, .text-registered, .panel-footer .text-registered {
.text-info, .text-registered, .card-footer .text-registered {
color: $info-color;
}
.text-success {
color: $success-color;
}
.text-warning, .text-draft, .panel-footer .text-draft {
.text-warning, .text-draft, .card-footer .text-draft {
color: $warning-color;
}
.text-danger {
Expand Down Expand Up @@ -97,7 +97,7 @@ category: Components
padding: 0 0 0 10px;
}

.required-nested-label label.control-label.col-md-3:before {
.required-nested-label label.col-form-label.md-3:before {
color: #e74c3c;
content: "* ";
}
Expand All @@ -107,11 +107,11 @@ category: Components
content: "* ";
}

.required-nested-label .form-group.has-success label:before, .required-nested-label.form-group.has-success label:before {
.required-nested-label .form-control.has-success label:before, .required-nested-label.form-control.has-success label:before {
content: "* ";
color: $success-color;
}

label.subtitle:after {
content: "";
}
}
6 changes: 3 additions & 3 deletions src/stylesheets/doi/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ category: Components
}

// Apply the mixin to the buttons
//.btn-default { @include btn-styles($default-color, $default-states-color); }
//.btn-secondary { @include btn-styles($default-color, $default-states-color); }
.navbar .navbar-nav > li > a.btn-primary, .btn-primary { @include btn-styles($primary-color, $primary-states-color); }
.navbar .navbar-nav > li > a.btn-success, .btn-success { @include btn-styles($success-color, $success-states-color); }
.navbar .navbar-nav > li > a.btn-info, .btn-info { @include btn-styles($info-color, $info-states-color); }
Expand Down Expand Up @@ -123,7 +123,7 @@ category: Components
.btn-sm{
@include btn-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-btn-small, $line-height-small);
}
.btn-xs {
.btn-sm {
@include btn-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $border-radius-btn-small, $line-height-small);
}
.btn-wd {
Expand Down Expand Up @@ -182,7 +182,7 @@ $bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1) !
font-size: 1.4em;
}
}
&.btn-xs {
&.btn-sm {
padding-left: ($bs-height-xs + $padding-small-horizontal);
> :first-child {
line-height: $bs-height-xs;
Expand Down
14 changes: 7 additions & 7 deletions src/stylesheets/doi/components/_carousel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
}
}

.carousel-control.left{
.carousel-control-prev {
height: 30px;
top: 50%;
width: 30px;
left: 8%;
}
.carousel-control.right{
.carousel-control-next {
height: 30px;
right: 8%;
top: 50%;
Expand All @@ -31,17 +31,17 @@
font-size: 26px;
margin: 2px;
}
.carousel-control.left, .carousel-control.right {
.carousel-control-prev, .carousel-control-next {
background-image: none;
}
.carousel-inner{
background-color: #d6d2cc;
}
.carousel-inner > .item {
.carousel-inner > .carousel-item {
padding: 50px;
}
.carousel-inner > .item > img,
.carousel-inner > .item > a > img{
.carousel-inner > .carousel-item > img,
.carousel-inner > .carousel-item > a > img{
border-radius: $border-radius-extreme;
box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
margin-left: 25%;
Expand All @@ -56,4 +56,4 @@
}
.carousel-indicators .active{
background-color: $danger-color;
}
}
55 changes: 20 additions & 35 deletions src/stylesheets/doi/components/_checkbox-radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Checkbox and radio */
.checkbox, .radio {
.form-check {
margin-bottom: 12px;
margin-right: 12px;
display: inline;
Expand Down Expand Up @@ -41,10 +41,8 @@
// }
}

// .checkbox .icons .first-icon,
// .radio .icons .first-icon,
// .checkbox .icons .second-icon,
// .radio .icons .second-icon {
// .form-check .icons .first-icon,
// .form-check .icons .second-icon {
// display: inline-table;
// position: absolute;
// left: 0;
Expand All @@ -53,75 +51,62 @@
// margin: 0;
// @include opacity(1);
// }
// .checkbox .icons .second-icon,
// .radio .icons .second-icon {
// .form-check .icons .second-icon {
// @include opacity(0);
// }
// .checkbox:hover,
// .radio:hover {
// .form-check:hover {
// -webkit-transition: color 0.2s linear;
// transition: color 0.2s linear;
// }
// .checkbox:hover .first-icon,
// .radio:hover .first-icon {
// .form-check:hover .first-icon {
// @include opacity(0);
// }
// .checkbox:hover .second-icon,
// .radio:hover .second-icon {
// .form-check:hover .second-icon {
// @include opacity (1);
// }
// .checkbox.checked,
// .radio.checked {
// .form-check.checked {
// // color: $info-color;
// }
// .checkbox.checked .first-icon,
// .radio.checked .first-icon {
// .form-check.checked .first-icon {
// opacity: 0;
// filter: alpha(opacity=0);
// }
// .checkbox.checked .second-icon,
// .radio.checked .second-icon {
// .form-check.checked .second-icon {
// opacity: 1;
// filter: alpha(opacity=100);
// // color: $info-color;
// -webkit-transition: color 0.2s linear;
// transition: color 0.2s linear;
// }
// .checkbox.disabled,
// .radio.disabled {
// .form-check.disabled {
// cursor: default;
// color: $medium-gray;
// }
// .checkbox.disabled .icons,
// .radio.disabled .icons {
// .form-check.disabled .icons {
// color: $medium-gray;
// }
// .checkbox.disabled .first-icon,
// .radio.disabled .first-icon {
// .form-check.disabled .first-icon {
// opacity: 1;
// filter: alpha(opacity=100);
// }
// .checkbox.disabled .second-icon,
// .radio.disabled .second-icon {
// .form-check.disabled .second-icon {
// opacity: 0;
// filter: alpha(opacity=0);
// }
// .checkbox.disabled.checked .icons,
// .radio.disabled.checked .icons {
// .form-check.disabled.checked .icons {
// color: $medium-gray;
// }
// .checkbox.disabled.checked .first-icon,
// .radio.disabled.checked .first-icon {
// .form-check.disabled.checked .first-icon {
// opacity: 0;
// filter: alpha(opacity=0);
// }
// .checkbox.disabled.checked .second-icon,
// .radio.disabled.checked .second-icon {
// .form-check.disabled.checked .second-icon {
// opacity: 1;
// color: $medium-gray;
// filter: alpha(opacity=100);
// }

.col-md-9 > div > .help-block {
.md-9 > div > .form-text {
display: inline;
}
}

8 changes: 4 additions & 4 deletions src/stylesheets/doi/components/_collapse.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.panel-group .panel{
.panel-group .card {
border-radius: 0;
}
.panel-title, h4.panel-title {
.card-title, h4.card-title {
font-size: $font-size-h4;
font-weight: normal;
}
Expand All @@ -11,10 +11,10 @@
visibility: visible;
overflow: hidden;
}
.panel-title a:hover, .panel-title a:focus{
.card-title a:hover, .card-title a:focus{
color: $turquoise;
text-decoration: none;
}
.panel-default > .panel-heading + .panel-collapse.gsdk-collapse > .panel-body {
.panel-default > .card-header + .panel-collapse.gsdk-collapse > .card-body {
box-shadow: inset 0 7px 10px -7px rgba(0,0,0,0.14);
}
4 changes: 2 additions & 2 deletions src/stylesheets/doi/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
visibility: visible;
}

.divider{
.dropdown-divider{
background-color: $light-gray;
width: 1px;
margin: 0px;
Expand Down Expand Up @@ -121,6 +121,6 @@
}

// more compact selects
.compact-select .power-select-fragment div.form-group.ember-view {
.compact-select .power-select-fragment div.form-control.ember-view {
margin-bottom: 1px;
}
Loading