HomePhabricator

Merge branch 'feature/gui' into develop

Authored by Egedda on May 5 2016, 2:50 PM.

Description

Merge branch 'feature/gui' into develop

Details

Committed
EgeddaMay 5 2016, 2:50 PM
Parents
R1889:b0bb8beebac0: New comfy UI look
R1889:e73181b73c84: Merge branch 'feature/graph-types-pie-bar' into develop
Branches
Unknown
Tags
Unknown
ChangeId
None

Merged Changes

CommitAuthorDetailsCommitted
b0bb8beebac0ErikssonAnders
New comfy UI look 
May 5 2016
b340bcba3646ErikssonAnders
Fixed bug caused by merge in <highchart> element 
May 5 2016
ff9aac72739bErikssonAnders
Merge branch 'feature/graph-types-pie-bar' into HEAD 
May 5 2016
e38cf7844ebfErikssonAnders
Added box-shadow to left-col 
May 5 2016
5c1759025e63ErikssonAnders
Edited date row and search box 
May 4 2016
0f3e3bd37009ErikssonAnders
Removed bottom-bar.scss since it is now included in main.scss. 
May 2 2016
e04417ba61b0ErikssonAnders
Forgot to include index.html in last commit. 
Apr 29 2016
19440651e446ErikssonAnders
Modified right column to allow more space for graphdiv. 
Apr 29 2016
ba648b5e5269ErikssonAnders
Moved most of styling to main.scss and organized it. 
Apr 29 2016