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.

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

Ui facelift and usability improvements #1261

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
6113b0b
Replace old icon font with new font
May 12, 2017
89098f5
Add icon mixin for basic icon styles
Jul 10, 2017
a5a4f8f
Add icon selector for each icon glyph
May 12, 2017
65e61e1
Adjust render_icon helper to match new icon class names
May 12, 2017
c8ae6da
Add selector for muted icons
Jul 10, 2017
ab568a9
Replace all icons with the ones from the new icon font
May 12, 2017
855b7ea
Adjust icon layout of page and layoutpage view:
May 12, 2017
1503a4f
Remove and adjust custom styles related to the icon elements
May 12, 2017
66a7ea5
Adjust icon layout in tables
May 12, 2017
ef8102a
Restructure variables sass file and change color values
Jun 7, 2017
cfd37ce
Use variable for icon color
Jul 10, 2017
8b6fb76
Apply new colors to most of the elements and color certain icons
Jun 7, 2017
a95916a
Change color of alchemy icon svg in main menu bar into white
Jun 7, 2017
7bb27c1
Optimize main navigation layout
Jun 7, 2017
860d674
Optimize element editor panels layout
Jun 7, 2017
1ed329e
Optimize hints and notices
Jun 7, 2017
62a44be
Adjust action icons of pages, layout pages, tags and attachments tables:
Jun 7, 2017
9744e9a
Optimize list table and dashboard layout and appearance
Jun 7, 2017
619a3cb
Adjust buttons hover appearance
Jun 7, 2017
59986bc
Add custom online and offline icon for users list
Jun 7, 2017
a0a6b28
Fix flash notice icons and padding
Jun 8, 2017
ad23425
Deletes old icon font files
Jun 8, 2017
e30c23a
Add new colors for file type icons and tidy up color variables
Jun 8, 2017
355e76b
Restructure icon codes and add some new ones:
Jun 8, 2017
4d68898
Add drag icon to element header for better affordance and fix doubled…
Jun 8, 2017
bab7e41
Show button labels in toolbar for primary actions
Jun 9, 2017
08e8f89
Optimize search bar icon position and focus state
Jun 9, 2017
078791c
Change order of tool bar buttons
Jun 9, 2017
5bb818d
Repair clipboard and trash icon switching (empty/full)
Jun 9, 2017
7cc44db
Remove old icon styles
Jun 9, 2017
e2caf10
Shorten german translations for language options
Jun 9, 2017
e33a20a
Resolve icon class related failing tests
Jun 9, 2017
8e2c13c
Add instructions for updating the icon font
Jun 21, 2017
a43016d
Adjust interface colors and switch some icon colors
Jun 26, 2017
d827029
Adjust buttons, inputs and link/unlink input-button:
Jun 26, 2017
77c15fc
Display drag icon next to page name in page sorting dialog (pages view)
Jun 26, 2017
96062b0
Show status icons in link element modals page tree
Jun 26, 2017
4836cf5
Fix spinner position and drag icon in elements panel header
Jun 26, 2017
7467560
fixup
Jun 29, 2017
912bbf6
Adjust EssenceFile edit field and icon buttons style
Jun 30, 2017
3097dfe
Setup/restructure/change themeable variables to easier change basic i…
Jul 4, 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
Binary file added app/assets/fonts/alchemy/alchemy-icons.eot
Binary file not shown.
1,334 changes: 1,334 additions & 0 deletions app/assets/fonts/alchemy/alchemy-icons.json

Large diffs are not rendered by default.

89 changes: 89 additions & 0 deletions app/assets/fonts/alchemy/alchemy-icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/fonts/alchemy/alchemy-icons.ttf
Binary file not shown.
Binary file added app/assets/fonts/alchemy/alchemy-icons.woff
Binary file not shown.
Binary file removed app/assets/fonts/alchemy/icons.eot
Binary file not shown.
33 changes: 0 additions & 33 deletions app/assets/fonts/alchemy/icons.svg

This file was deleted.

Binary file removed app/assets/fonts/alchemy/icons.ttf
Binary file not shown.
Binary file removed app/assets/fonts/alchemy/icons.woff
Binary file not shown.
6 changes: 3 additions & 3 deletions app/assets/images/alchemy/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/javascripts/alchemy/alchemy.dialog.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class window.Alchemy.Dialog
@dialog_body = $('<div class="alchemy-dialog-body" />')
@dialog_header = $('<div class="alchemy-dialog-header" />')
@dialog_title = $('<div class="alchemy-dialog-title" />')
@close_button = $('<a class="alchemy-dialog-close"><span class="icon close small"></span></a>')
@close_button = $('<a class="alchemy-dialog-close"><span class="icon-close small"></span></a>')
@dialog_title.text(@options.title)
@dialog_header.append(@dialog_title)
@dialog_header.append(@close_button)
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/alchemy/alchemy.dirty.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ $.extend Alchemy,
$element = $(element)
$element.addClass('dirty')
$element
.find('> .element-header .icon[class*="element_"]')
.addClass('element_dirty')
.find('> .element-header .element-handle [class*="icon-"]')
.addClass('icon-edit')
window.onbeforeunload = @pageUnload

pageUnload: ->
Expand All @@ -24,7 +24,7 @@ $.extend Alchemy,
setElementClean: (element) ->
$element = $(element)
$element.removeClass('dirty')
$element.find('> .element-header .icon').removeClass('element_dirty')
$element.find('> .element-header .icon').removeClass('icon-edit')
$element.find('> .element-content .dirty').removeClass('dirty')
window.onbeforeunload = undefined

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Alchemy.ToolbarButton = (options) ->
e.preventDefault()
options.onClick(e)
false
$lnk.append "<span class='icon #{options.iconClass}' />"
$lnk.append "<span class='#{options.iconClass}' />"
$btn.append $lnk
$btn.append "<br><label>#{options.label}</label>"
$btn
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/alchemy/alchemy.growler.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Alchemy.Growler =
build: (message, flash_type) ->
$flash_container = $("<div class=\"flash #{flash_type}\" />")
icon_class = (if flash_type is "notice" then "tick" else flash_type)
$flash_container.append "<span class=\"icon #{icon_class}\" />"
$flash_container.append "<span class=\"icon-#{icon_class}\" />"
$flash_container.append message
$("#flash_notices").append $flash_container
$("#flash_notices").show()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class window.Alchemy.ImageOverlay extends Alchemy.Dialog
@dialog = $('<div class="alchemy-image-overlay-dialog" />')
@dialog_body = $('<div class="alchemy-image-overlay-body" />')
@close_button = $('<a class="alchemy-image-overlay-close">
<span class="icon close small"></span>
<span class="icon-close text-white"></span>
</a>')
@dialog.append(@close_button)
@dialog.append(@dialog_body)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Alchemy.PreviewWindow =

_hideSpinner: ->
@spinner.stop()
@reload.html('<span class="icon reload"></span>')
@reload.html('<span class="icon-refresh"></span>')

_bindReloadButton: ->
$reload = $('#reload_preview_button')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $.extend Alchemy,
# Update the trash window icon
updateIcon: ->
return unless @current?
$icon = $("#element_trash_button .icon")
$icon = $("#element_trash_button .icon-trash")
# Is the trash window open?
if $("#trash_items div.element-editor").not(".dragged").length is 0
$icon.removeClass("full")
Expand Down
13 changes: 5 additions & 8 deletions app/assets/stylesheets/alchemy/_extends.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
%thumbnail-background {
position: relative;
display: table-cell;
background-color: $dark-gray;
background-color: scale-color($xdark-gray, $lightness: 40%, $saturation: -40%);
text-align: center;
vertical-align: middle;
padding: 0;
Expand All @@ -35,15 +35,12 @@
%default-input-style {
box-sizing: border-box;
@extend %rounded-border;
box-shadow: inset 0px 1px 1px $medium-gray;
box-shadow: $input-box-shadow;
font: $default-font-style;
padding: 1px 2*$default-padding;
margin: $default-form-field-margin;
background: rgba(#fff, 0.9);
border-top: 1px solid $default-border-color;
border-left: 1px solid $default-border-color;
border-bottom: 1px solid $border-inset-color;
border-right: 1px solid $border-inset-color;
background: white;
border: 1px solid $input-border-color;
width: 100%;
font-size: 12px;
line-height: 12px;
Expand All @@ -66,7 +63,7 @@
}

%gradiated-toolbar {
background: $toolbar-bg-color;
background-color: $toolbar-bg-color;
padding: 8px 4px;
height: $default-form-field-height;
}
Loading