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

Jump to bottom

Issue #3014008: Fix entity meta sidebar in gutenberg #179

Merged
merged 13 commits into from
Dec 3, 2018
Merged

Issue #3014008: Fix entity meta sidebar in gutenberg #179

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4d2621c
moved styles
ol0lll Nov 16, 2018
d0fa593
add guard
ol0lll Nov 16, 2018
d609160
Merge branch '8.x-2.x' into fix/3014008-entity-meta-sidebar-in-gutenberg
ol0lll Nov 16, 2018
a83bacc
Fix annotation
mtodor Nov 28, 2018
56964af
Check bundle
mtodor Nov 28, 2018
8371175
add test for taxonomy edit
ol0lll Nov 28, 2018
a5eb3e9
[UPDATE_SCREENSHOTS=true]
ol0lll Nov 28, 2018
0e10b65
TRAVIS: Updated visual reference images for chrome
ThunderTechAccount Nov 28, 2018
4b7f82c
[UPDATE_SCREENSHOTS=true]
ol0lll Nov 28, 2018
ba473f8
Merge branch 'fix/3014008-entity-meta-sidebar-in-gutenberg' of github…
ol0lll Nov 28, 2018
9fe2a1e
[UPDATE_SCREENSHOTS=true]
ol0lll Nov 28, 2018
56188e2
TRAVIS: Updated visual reference images for firefox
ThunderTechAccount Nov 28, 2018
a43c68b
Merge branch '8.x-2.x' into fix/3014008-entity-meta-sidebar-in-gutenberg
ol0lll Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions css/color-scheme-inverted.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@
border-color:#07364a;
}

.color-scheme-inverted .seven-details > summary{
color:#dae0e3;
}

.color-scheme-inverted .seven-details > summary:hover{
text-decoration:none;
}

.color-scheme-inverted .seven-details > summary .details-title{
color:#dae0e3;
}

.color-scheme-inverted .seven-details > summary .details-title:hover{
text-decoration:none;
}

.color-scheme-inverted label{
color:#dae0e3;
}
Expand Down
16 changes: 0 additions & 16 deletions css/components/entity-meta.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,3 @@
text-shadow:0 1px 0 #fff;
margin:0.25em 0;
}

.entity-meta .seven-details > summary{
color:#dae0e3;
}

.entity-meta .seven-details > summary:hover{
text-decoration:none;
}

.entity-meta .seven-details > summary .details-title{
color:#dae0e3;
}

.entity-meta .seven-details > summary .details-title:hover{
text-decoration:none;
}
16 changes: 16 additions & 0 deletions sass/color-scheme-inverted.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@
border-color: $primary-color-darker;
}

.seven-details > summary {
ol0lll marked this conversation as resolved.
Show resolved Hide resolved
color: $gray-lighter;

&:hover {
text-decoration: none; // Added.
}

.details-title {
color: $gray-lighter; // Added.

&:hover {
text-decoration: none; // Added.
}
}
}

label {
color: $gray-lighter;
}
Expand Down
15 changes: 0 additions & 15 deletions sass/components/entity-meta.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,3 @@
margin: 0.25em 0;
}

.entity-meta .seven-details > summary {
color: $gray-lighter;

&:hover {
text-decoration: none; // Added.
}

.details-title {
color: $gray-lighter; // Added.

&:hover {
text-decoration: none; // Added.
}
}
}
14 changes: 10 additions & 4 deletions thunder_admin.theme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,20 @@ function thunder_admin_theme_suggestions_form_element_alter(&$suggestions, $vari
*/
function thunder_admin_form_alter(&$form, FormStateInterface $form_state, $form_id) {
if (!empty($form['advanced']) && (_thunder_admin_apply_advanced_vertical_tabs())) {
/** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
$form_object = $form_state->getFormObject();
/** @var \Drupal\node\NodeInterface $entity */
ol0lll marked this conversation as resolved.
Show resolved Hide resolved
$entity = $form_object->getEntity();

$gutenberg_enabled = \Drupal::service('config.factory')->getEditable('gutenberg.settings')->get($entity->getType() . '_enable_full');
ol0lll marked this conversation as resolved.
Show resolved Hide resolved
if ($gutenberg_enabled) {
return;
}

_thunder_admin_attach_advanced_vertical_tabs($form, $form_state);
$form['#theme'] = ['node_edit_form'];

if (\Drupal::hasService('content_moderation.moderation_information')) {
/** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
$form_object = $form_state->getFormObject();
/** @var \Drupal\node\NodeInterface $entity */
$entity = $form_object->getEntity();

/** @var \Drupal\content_moderation\ModerationInformationInterface $moderation_info */
$moderation_info = \Drupal::service('content_moderation.moderation_information');
Expand Down