Skip to content

Commit

Permalink
Visual design changes
Browse files Browse the repository at this point in the history
  • Loading branch information
benfrancis committed Oct 19, 2015
1 parent 5676ce2 commit cfdace8
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 27 deletions.
68 changes: 42 additions & 26 deletions css/shell.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ body {
flex-direction: column;
}

/* Prevent dotted outlines on buttons */
button::-moz-focus-inner {
border: 0;
}

/* Window Manager */

#windows {
Expand All @@ -33,9 +38,6 @@ body {
box-sizing: border-box;
width: 100%;
height: 100%;
background-color: #666;
border-radius: 0.5rem;
border: solid #666 0.5rem;
}

.browser-window.hidden {
Expand All @@ -46,8 +48,8 @@ body {
position: absolute;
top: 0;
right: 0;
height: 3.5rem;
width: 3.5rem;
height: 3rem;
width: 3rem;
padding: 0;
margin: 0;
background-color: transparent;
Expand Down Expand Up @@ -103,7 +105,7 @@ body {
}

.browser-tab.selected {
background-color: #e5e5e5;
background-color: #5d5d5d;
border: none;
border-radius: 0.5rem 0.5rem 0 0;
}
Expand Down Expand Up @@ -133,10 +135,6 @@ body {
opacity: 1;
}

.browser-tab.selected .close-tab-button {
background-image: url("../images/close-dark.png");
}

.new-tab-button {
height: 3rem;
width: 3rem;
Expand Down Expand Up @@ -166,27 +164,43 @@ body {
}

.browser-tab-panel {
background-color: #e5e5e5;
background-color: #5d5d5d;
height: 100%;
display: none;
border-radius: 0.5rem;
}

.browser-tab-panel:first-child {
border-top-left-radius: 0;
}

.browser-tab-panel.selected {
display: block;
}

.browser-tab-frame {
height: 100%;
width: 100%;
border: none;
border-radius: 0.5rem;
}

.browser-tab-panel:first-child .browser-tab-frame {
border-top-left-radius: 0;
}

/* System Toolbar */
#system-toolbar {
display: flex;
width: 100%;
height: 3rem;
height: 3.2rem;
margin: 0;
padding: 0;
color: #aaa;
}

#window-controls {
height: 3rem;
height: 3.2rem;
padding: 0;
margin: 0;
flex: 1;
Expand All @@ -196,37 +210,39 @@ body {
display: inline;
margin: 0;
padding: 0;
height: 3rem;
height: 3.2rem;
width: auto;
float: left;
}

.window-selector {
width: 3rem;
height: 2.6rem;
background-color: #333;
border-bottom-left-radius: 0.5rem;
border-bottom-right-radius: 0.5rem;
width: 3.2rem;
height: 3rem;
background-color: transparent;
background-image: url("../images/browser-icon.png");
background-position: center center;
background-repeat: no-repeat;
border: none;
margin: 0 0.2rem;
padding: 0;
border-bottom: solid 2px transparent;
}

.window-selector:hover {
background-color: #444;
border-bottom: solid 2px #666;
}

.window-selector:active {
background-color: #666;
border-bottom: solid 2px #fff;
}

.window-selector.selected {
background-color: #666;
border-bottom: solid 2px #ccc;
}

#new-window-button {
height: 3rem;
width: 3rem;
height: 3.2rem;
width: 3.2rem;
padding: 0;
margin: 0;
background-color: transparent;
Expand All @@ -247,6 +263,6 @@ body {

#clock {
font-size: 1.3rem;
line-height: 30px;
padding: 0 10px;
line-height: 3.2rem;
padding: 0 1rem;
}
Binary file added images/browser-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion js/BrowserTabPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ var BrowserTabPanel = function(tabId, windowId) {
*/
BrowserTabPanel.prototype.view = function() {
return '<div id="tab-panel' + this.windowId + '-' + this.id +
'"class="browser-tab-panel"></div>';
'"class="browser-tab-panel"><iframe src="http://duckduckgo.com"' +
'class="browser-tab-frame"></div>';
};

/**
Expand Down

0 comments on commit cfdace8

Please sign in to comment.