yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-31 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix styles due to bootstrap upgrade

Browse Source
This commit is contained in:
cyril lopez 2017-10-16 14:30:26 +02:00
parent 8c26406654
commit 203f7de94f
14 changed files with 81 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-admin/admin/src/styles/libs/bootstrap/_buttons.scss
View File

@ -12,8 +12,8 @@
vertical-align: middle;
user-select: none;
border: $input-btn-border-width solid transparent;
@include button-size($input-btn-padding-y, $input-btn-padding-x, $font-size-base, $input-btn-line-height, $btn-border-radius);
@include transition($btn-transition);
// @include button-size($input-btn-padding-y, $input-btn-padding-x, $font-size-base, $input-btn-line-height, $btn-border-radius);
// @include transition($btn-transition);
// Share hover and focus styles
@include hover-focus {

2
packages/strapi-admin/admin/src/styles/libs/bootstrap/mixins/_buttons.scss
View File

@ -21,7 +21,7 @@
@if $enable-shadows {
box-shadow: $btn-box-shadow, 0 0 0 3px rgba($border, .5);
} @else {
box-shadow: 0 0 0 3px rgba($border, .5);
box-shadow: 0 0 0 0px rgba($border, .5);
}
}

5
packages/strapi-helper-plugin/lib/internals/webpack/webpack.dll.babel.js
View File

@ -14,7 +14,7 @@ const webpack = require('webpack');
module.exports = {
context: process.cwd(),
entry: {
vendor: ['react', 'react-dom', 'react-intl', 'react-transition-group', 'immutable', 'lodash'] // Shared dependencies accross the admin and plugins.
vendor: ['react', 'react-dom', 'react-intl', 'reactstrap', 'react-transition-group', 'immutable', 'lodash'] // Shared dependencies accross the admin and plugins.
},
devtool: 'cheap-module-source-map',
output: {
@ -45,7 +45,8 @@ module.exports = {
'react-intl': path.resolve(__dirname, '..', '..', '..', 'node_modules', 'react-intl'),
'react': path.resolve(__dirname, '..', '..', '..', 'node_modules', 'react'),
'react-dom': path.resolve(__dirname, '..', '..', '..', 'node_modules', 'react-dom'),
'react-transition-group': path.resolve(__dirname, '..', '..', '..', 'node_modules', 'react-transition-group')
'react-transition-group': path.resolve(__dirname, '..', '..', '..', 'node_modules', 'react-transition-group'),
'reactstrap': path.resolve(__dirname, '..', '..', '..', 'node_modules', 'reactstrap')
},
symlinks: false,
extensions: [

11
packages/strapi-helper-plugin/lib/src/components/PopUpWarning/styles.scss
View File

@ -53,6 +53,7 @@
position: relative;
border-radius: 0.3rem;
text-transform: capitalize;
background-color: transparent;
cursor: pointer;
font-family: Lato;
&:focus {
@ -82,8 +83,11 @@
-webkit-font-smoothing: antialiased;
color: white !important;
border: none;
&:active {
&:active, &:focus, &:hover {
box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
background-color: transparent;
border: none;
}
}
.secondary {
@ -96,6 +100,11 @@
&:active {
border: 0.15rem solid #F64D0A;
}
&:focus, &:hover {
background-color: transparent;
color: #F64D0A;
border: 0.1rem solid #F64D0A;
}
}
.bordered {
margin-top: -.4rem;

6
packages/strapi-helper-plugin/package.json
View File

@ -90,16 +90,16 @@
"postcss-smart-import": "^0.7.5",
"precss": "^2.0.0",
"prettier": "^1.5.3",
"react": "^16.0.0-rc.3",
"react": "^16.0.0",
"react-datetime": "^2.8.6",
"react-dom": "^16.0.0-rc.3",
"react-dom": "^16.0.0",
"react-helmet": "^5.1.3",
"react-intl": "^2.3.0",
"react-redux": "^5.0.6",
"react-router-dom": "^4.1.2",
"react-router-redux": "^5.0.0-alpha.6",
"react-transition-group": "^2.2.0",
"reactstrap": "^5.0.0-alpha.1",
"reactstrap": "^5.0.0-alpha.3",
"redux": "^3.7.2",
"redux-immutable": "^4.0.0",
"redux-saga": "^0.15.6",

2
packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/styles.scss
View File

@ -46,7 +46,7 @@
}
.buttonContainer {
padding-top: .3rem;
padding-top: .4rem;
> button:last-child {
margin-right: 0;
}

2
packages/strapi-plugin-content-type-builder/admin/src/components/List/styles.scss
View File

@ -23,7 +23,7 @@
.ulContainer {
> ul {
margin-top: 1.6rem;
margin-top: 1.5rem;
padding: 0;
list-style: none;
}

10
packages/strapi-plugin-content-type-builder/admin/src/components/PopUpForm/styles.scss
View File

@ -97,7 +97,7 @@
&:hover, &:focus {
color: #C3C5C8;
opacity: 1;
outline: 0;
outline: 0!important;
}
> span {
display: none;
@ -130,6 +130,11 @@
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
-webkit-font-smoothing: antialiased;
color: white!important;
&:hover, &:active {
border: none!important;
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
color: white;
}
}
.secondary {
@ -138,7 +143,8 @@
color: #F64D0A;
border: 0.1rem solid #F64D0A;
cursor: pointer;
&:hover {
background-color: transparent;
&:hover, &:active {
color: #F64D0A;
background-color: white;
border: 0.1rem solid #F64D0A;

3
packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/styles.scss
View File

@ -184,7 +184,8 @@
color: #F64D0A;
border: 0.1rem solid #F64D0A;
cursor: pointer;
&:hover {
background-color: transparent;
&:hover, &:active {
color: #F64D0A;
background-color: white;
border: 0.1rem solid #F64D0A;

2
packages/strapi-plugin-content-type-builder/admin/src/components/TableList/styles.scss
View File

@ -29,7 +29,7 @@
padding: 0;
list-style: none;
> li:first-child {
margin-top: 0rem;
margin-top: 0.1rem;
border-radius: 2px 2px 0 0;
background-color: #F3F3F4;
}

1
packages/strapi-plugin-content-type-builder/package.json
View File

@ -31,7 +31,6 @@
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-transition-group": "^1.2.0",
"reactstrap": "^4.8.0",
"strapi-generate": "3.0.0-alpha.5.5",
"strapi-generate-api": "3.0.0-alpha.5.5"
},

7
packages/strapi-plugin-settings-manager/admin/src/components/List/styles.scss
View File

@ -176,12 +176,19 @@ button {
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
-webkit-font-smoothing: antialiased;
color: white!important;
&:active, &:focus, &:hover {
box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
background-color: transparent;
border: none;
}
}
.secondary {
font-family: Lato;
color: #F64D0A;
border: 0.1rem solid #F64D0A;
background-color: transparent;
cursor: pointer;
&:hover {
color: #F64D0A;

35
packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/styles.scss
View File

@ -72,6 +72,7 @@
width: 15rem;
border: none;
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
-webkit-font-smoothing: antialiased;
&:active {
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
background-color: none!important;
@ -86,6 +87,11 @@
width: 15rem;
color: #F64D0A;
border: 0.1rem solid #F64D0A;
&:focus, &:hover {
background-color: transparent;
color: #F64D0A;
border: 0.1rem solid #F64D0A;
}
}
.buttonContainer {
@ -94,6 +100,35 @@
display: flex;
margin-top: 3rem;
justify-content: space-between;
> button {
height: 3rem;
width: 15rem;
position: relative;
border-radius: 0.3rem;
text-transform: capitalize;
background-color: transparent;
cursor: pointer;
font-family: Lato;
&:focus {
outline: 0;
}
> i {
margin-right: 1.3rem;
}
&:hover {
&::after {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
border-radius: 0.3rem;
content: '';
opacity: 0.1;
background: #FFFFFF;
}
}
}
}
.modalBody {

3
packages/strapi-plugin-settings-manager/package.json
View File

@ -29,8 +29,7 @@
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-select": "^1.0.0-rc.5",
"react-transition-group": "^1.2.0",
"reactstrap": "^4.8.0"
"react-transition-group": "^1.2.0"
},
"devDependencies": {
"cross-env": "^5.0.5",