Skip to content

Change mode switcher to a select box #389

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

Merged
aduth merged 4 commits into from
Apr 10, 2017
Merged

Change mode switcher to a select box #389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dda0821
Change mode switcher to use a select box.
jasmussen Apr 10, 2017
3b3cd44
CSS style the selector.
jasmussen Apr 10, 2017
c3dc925
Use mode switcher mode value from state directly
aduth Apr 10, 2017
fe4cf93
Target mode switcher child styles by classname
aduth Apr 10, 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
Prev Previous commit
Next Next commit
CSS style the selector.
  • Loading branch information
@jasmussen
jasmussen committed Apr 10, 2017
commit 3b3cd442e626131c46fdb6bce74e8cea3fb1912f
5 changes: 5 additions & 0 deletions editor/assets/stylesheets/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ body.toplevel_page_gutenberg {
ol {
list-style-type: decimal;
}

select {
font-size: 13px;
color: $dark-gray-500;
}
}

.gutenberg__editor {
Expand Down
2 changes: 2 additions & 0 deletions editor/header/mode-switcher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { connect } from 'react-redux';
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../../components/dashicon';

class ModeSwitcher extends wp.element.Component {
constructor() {
Expand Down Expand Up @@ -39,6 +40,7 @@ class ModeSwitcher extends wp.element.Component {
</option>
) }
</select>
<Dashicon icon="arrow-down" />
</div>
);
}
Expand Down
64 changes: 18 additions & 46 deletions editor/header/mode-switcher/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,36 @@
.editor-mode-switcher {
position: relative;
margin-right: $item-spacing;
}

.editor-mode-switcher__toggle {
padding-right: $item-spacing;
color: $dark-gray-500;
padding: $item-spacing;
align-items: center;
cursor: pointer;
border: none;
background: none;
border-right: 1px solid $light-gray-500;
outline: none;
display: flex;
align-items: center;
}

.editor-mode-switcher__content {
position: absolute;
top: 40px;
border: 1px solid $light-gray-500;
color: $dark-gray-500;
min-width: 100px;

button {
padding: 8px;
display: block;
border: none;
background: white;
select {
background: transparent;
line-height: 1;
Copy link
Member

@aduth aduth Apr 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No linting to capture it, but we ought to be cautious of mixed spacing in SCSS files.

Copy link
Contributor Author

@jasmussen jasmussen Apr 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wanted to let you know that I really appreciate this and very much taking notes. Thanks for pushing fixes too.

border: 0;
border-radius: 0;
-webkit-appearance: none;
outline: none;
cursor: pointer;
width: 100%;
box-shadow: none;
padding-right: 24px;
}
}

.editor-mode-switcher__arrow {
border: 10px dashed $light-gray-500;
height: 0;
line-height: 0;
position: absolute;
width: 0;
z-index: 1;
top: -10px;
left: 50%;
margin-left: -10px;
border-bottom-style: solid;
border-top: none;
border-left-color: transparent;
border-right-color: transparent;
svg {
position: relative;
z-index: -1;
margin-left: -24px;
margin-top: -1px;
}

&:before {
top: 2px;
border: 10px solid white;
content: " ";
position: absolute;
left: 50%;
margin-left: -10px;
border-bottom-style: solid;
border-top: none;
border-left-color: transparent;
border-right-color: transparent;
&:hover,
select:hover {
color: $dark-gray-900;
}
}
4 changes: 2 additions & 2 deletions languages/gutenberg.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ msgstr ""
msgid "Align right"
msgstr ""

#: editor/header/mode-switcher/index.js:28
#: editor/header/mode-switcher/index.js:29
msgid "Visual"
msgstr ""

#: editor/header/mode-switcher/index.js:29
#: editor/header/mode-switcher/index.js:30
msgctxt "Name for the Text editor tab (formerly HTML)"
msgid "Text"
msgstr ""
Expand Down