tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes custom styling for wordpress modal. Fixes different container heights for when its repository or collection level, preventing double scroll

This commit is contained in:
Mateus Machado Luna 2018-05-02 10:39:45 -03:00
parent 1074fc4916
commit ed1a87820f
5 changed files with 135 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/admin/components/edition/collection-edition-form.vue
View File

@ -1,7 +1,5 @@
<template>
<div
class="page-container"
:class="{'primary-page' : isNewCollection }">
<div :class="{'primary-page' : isNewCollection }">
<b-tag
v-if="collection != null && collection != undefined"
:type="'is-' + getStatusColor(collection.status)"

3
src/admin/components/edition/item-edition-form.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="page-container">
<div>
<div class="tainacan-page-title">
<h2>{{ $i18n.get('title_item_edition') }}</h2>
<a
@ -341,7 +341,6 @@ export default {
]),
...mapGetters('item',[
'getFields',
'getItem',
'getAttachments'
]),
onSubmit() {

2
src/admin/pages/singles/collection-page.vue
View File

@ -4,7 +4,7 @@
<tainacan-subheader :id="collectionId"/>
<router-view
:collection-id="collectionId"
class="page-container"/>
class="page-container page-container-small"/>
</section>
</div>
</template>

251
src/admin/scss/tainacan-admin.scss
View File

@ -64,15 +64,18 @@ html {
}
}
.page-container-small{
padding: $page-small-top-padding $page-small-side-padding;
height: calc(100% - 82px);
overflow-y: auto;
}
.page-container-narrow{
padding: $page-small-top-padding $page-small-side-padding;
@media screen and (max-width: 769px) {
padding: $page-mobile-top-padding $page-mobile-side-padding;
}
}
.tainacan-page-title, .tainacan-modal-title {
h1, h2 {
font-size: 20px;
@ -377,6 +380,9 @@ html {
.wp-core-ui {
a:focus{ box-shadow: none; }
}
.media-modal-backdrop {
z-index: 9999999 !important;
}
.media-modal {
left: 100px;
top: 100px;
@ -384,122 +390,127 @@ html {
right: 100px;
background-color: white;
z-index: 99999999999 !important;
.media-modal-content {
background-color: white;
margin: 42px 60px;
box-shadow: none;
}
.media-frame-title {
border-bottom: 1px solid #298596 !important;
margin-bottom: 60px !important;
box-shadow: none !important;
h1, h2 {
font-size: 20px;
font-weight: 500;
color: $tertiary;
display: inline-block;
margin-bottom: 3px;
}
}
.media-frame-router {
margin-top: 28px;
a.media-menu-item.active {
border-top: none;
border-left: none;
border-right: none;
border-bottom: 3px solid $primary;
}
}
.media-frame-content {
margin-top: 30px;
.attachments-browser .attachments, .media-toolbar {
padding: 12px;
right: 270px;
.media-toolbar-primary {
max-width: 30%;
}
.media-toolbar-secondary {
max-width: 70%;
}
.attachment {
padding: 12px;
}
.attachment.details {
box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 14px $primary-light;
}
.attachment.details .check, .wp-core-ui .attachment.selected .check:focus, .wp-core-ui .media-frame.mode-grid .attachment.selected .check {
background-color: $primary-light;
box-shadow: 0 0 0 1px #fff,0 0 0 2px $primary-light;
}
}
.media-sidebar {
background-color: white;
width: 238px;
}
.crop-content{
.imgareaselect-outer {
background-color: white;
opacity: 0.6;
}
}
}
.media-frame-toolbar .media-toolbar {
bottom: initial;
margin-top: -1px;
padding: 28px 0px;
}
.media-button.button-primary {
background-color: $success;
border: none;
box-shadow: none;
color: #fff;
text-decoration: none;
text-shadow: none;
}
.media-button.button-primary[disabled] {
color: #66c6e4 !important;
background: $success !important;
border-color: none!important;
box-shadow: none !important;
text-shadow: none !important;
cursor: default;
}
.media-button.button-secondary {
color: $tertiary;
border-color: #999;
background: white;
box-shadow: none;
vertical-align: middle;
}
.button-hero {
background-color: $secondary;
border: none;
box-shadow: none;
color: #fff;
text-decoration: none;
text-shadow: none;
font-size: 14px;
height: 46px;
line-height: 20px !important;
padding: 0 36px;
&:hover{
background-color: #339daf;
color: white;
}
}
}
.media-modal-backdrop {
z-index: 9999999 !important;
}
// .media-modal {
// left: 100px;
// top: 100px;
// bottom: 100px;
// right: 100px;
// background-color: white;
// z-index: 99999999999 !important;
// .media-modal-content {
// background-color: white;
// margin: 42px 60px;
// box-shadow: none;
// }
// .media-frame-title {
// border-bottom: 1px solid #298596 !important;
// margin-bottom: 60px !important;
// box-shadow: none !important;
// h1, h2 {
// font-size: 20px;
// font-weight: 500;
// color: $tertiary;
// display: inline-block;
// margin-bottom: 3px;
// }
// }
// .media-frame-router {
// margin-top: 28px;
// a.media-menu-item.active {
// border-top: none;
// border-left: none;
// border-right: none;
// border-bottom: 3px solid $primary;
// }
// }
// .media-frame-content {
// margin-top: 30px;
// .attachments-browser .attachments, .media-toolbar {
// padding: 12px;
// right: 270px;
// .media-toolbar-primary {
// max-width: 30%;
// }
// .media-toolbar-secondary {
// max-width: 70%;
// }
// .attachment {
// padding: 12px;
// }
// .attachment.details {
// box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 14px $primary-light;
// }
// .attachment.details .check, .wp-core-ui .attachment.selected .check:focus, .wp-core-ui .media-frame.mode-grid .attachment.selected .check {
// background-color: $primary-light;
// box-shadow: 0 0 0 1px #fff,0 0 0 2px $primary-light;
// }
// }
// .media-sidebar {
// background-color: white;
// width: 238px;
// }
// .crop-content{
// .imgareaselect-outer {
// background-color: white;
// opacity: 0.6;
// }
// }
// }
// .media-frame-toolbar .media-toolbar {
// bottom: initial;
// margin-top: -1px;
// padding: 28px 0px;
// }
// .media-button.button-primary {
// background-color: $success;
// border: none;
// box-shadow: none;
// color: #fff;
// text-decoration: none;
// text-shadow: none;
// }
// .media-button.button-primary[disabled] {
// color: #66c6e4 !important;
// background: $success !important;
// border-color: none!important;
// box-shadow: none !important;
// text-shadow: none !important;
// cursor: default;
// }
// .media-button.button-secondary {
// color: $tertiary;
// border-color: #999;
// background: white;
// box-shadow: none;
// vertical-align: middle;
// }
// .button-hero {
// background-color: $secondary;
// border: none;
// box-shadow: none;
// color: #fff;
// text-decoration: none;
// text-shadow: none;
// font-size: 14px;
// height: 46px;
// line-height: 20px !important;
// padding: 0 36px;
// &:hover{
// background-color: #339daf;
// color: white;
// }
// }
// }

2
src/js/store/modules/item/actions.js
View File

@ -89,7 +89,7 @@ export const sendItem = ( { commit }, { collection_id, status }) => {
status: status
})
.then( res => {
commit('setItem', { collection_id: collection_id, status: status });
commit('setItem', res.data);
resolve( res.data );
})
.catch(error => {