kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed theme colors

Browse Source
This commit is contained in:
Kenneth Jao 2016-09-27 12:04:40 -04:00
parent 94f775b0d6
commit c9ad662b36
5 changed files with 112 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
hourglass/client/main/main.html
View File

@ -5,16 +5,16 @@
<template name="main">
<div class="noScroll">
<header id="mainHeader" style="background-color:{{userProfile}}{{divColor 'header'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
<header id="mainHeader" style="background-color:{{userProfile}}{{divColor 'mainColor'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
<i class="fa fa-bars" aria-hidden="true" style="color:{{iconColor 'menu'}}"></i>
<h1>Hourglass</h1><h2>{{schoolName}}</h2>
<i class="fa fa-cog" aria-hidden="true" style="color:{{iconColor 'options'}}"></i>
<div id="dropdown">
<img src="{{avatar}}">
</div>
<div id="headerBar" style="background-color:{{divColor 'statusIcons'}}"></div>
<div id="headerBar" style="background-color:{{divColor 'iconHighlight'}}"></div>
</header>
<div id="menuContainer" style="left:{{menuStatus}};background-color:{{divColor 'sidebar'}}">
<div id="menuContainer" style="left:{{menuStatus}};background-color:{{divColor 'sidebarColor'}}">
<div id="modes">
<div class="mode classes">
<i class="fa fa-university" aria-hidden="true"></i>
@ -59,7 +59,7 @@
<h4 id="exportText">Export</h4>
</div>
</div>
<div id="optionsContainer" style="right:{{optionsStatus}};background-color:{{divColor 'sidebar'}}">
<div id="optionsContainer" style="right:{{optionsStatus}};background-color:{{divColor 'sidebarColor'}}">
<h3>Preferences</h3>
<div id="prefCont">
@ -69,8 +69,8 @@
<span class="change radio" re="readonly" id="prefTheme">{{pref 'theme'}}</span>
</div>
<div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Light</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Dark</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Light</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Dark</p>
</div>
</div>
<div>
@ -79,8 +79,8 @@
<span class="change radio" re="readonly" id="prefMode">{{pref 'mode'}}</span>
</div>
<div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Classes</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Calendar</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Classes</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Calendar</p>
</div>
</div>
<div>
@ -89,11 +89,11 @@
<span class="change radio" re="readonly" id="prefHide">{{pref 'timeHide'}}</span>
</div>
<div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">1 Day</p>
<P class="prefOptionText" style="background-color:{{divColor 'header'}}">2 Days</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">1 Week</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">1 Month</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Never</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">1 Day</p>
<P class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">2 Days</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">1 Week</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">1 Month</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Never</p>
</div>
</div>
<div>
@ -102,8 +102,8 @@
<span class="change radio" re="readonly" id="prefDone">{{pref 'done'}}</span>
</div>
<div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Yes</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">No</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div>
</div>
<div>
@ -112,8 +112,8 @@
<span class="change radio" re="readonly" id="prefReport">{{pref 'hideReport'}}</span>
</div>
<div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Yes</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">No</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div>
</div>
</div>
@ -137,7 +137,7 @@
<div class="overlay">
<div id="editWork" style="width:{{screen '.4'}}">
<div id="editWorkCont" style="background-color:{{divColor 'header'}};border-top:10px solid {{work 'typeColor'}}">
<div id="editWorkCont" style="background-color:{{divColor 'mainColor'}};border-top:10px solid {{work 'typeColor'}}">
<div id="workInfoContainer">
<div id="workNameDiv">
<span id="workNamerestrict">{{commentLength}}</span>
@ -159,11 +159,11 @@
<span class="change radio req" re="readonly" id="workType">{{work 'type'}}</span>
</div>
<div class="workOptions type">
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Normal</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Quiz</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Test</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Project</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Other</p>
<p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Normal</p>
<p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Quiz</p>
<p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Test</p>
<p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Project</p>
<p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Other</p>
</div>
</div>
<!-- <div id="workAttach">Attach other files</div>
@ -233,13 +233,13 @@
</div>
</div>
<div id="userDropdown" style="background-color:{{divColor 'dropdown'}}">
<div id="userTab" style="border-bottom: 3vh solid {{divColor 'dropdown'}}"></div>
<div id="userDropdownAvatar" style="background-color:{{divColor 'dropdown'}}">
<div id="userDropdown" style="background-color:{{divColor 'userDropdownColor'}}">
<div id="userTab" style="border-bottom: 3vh solid {{divColor 'userDropdownColor'}}"></div>
<div id="userDropdownAvatar" style="background-color:{{divColor 'userDropdownColor'}}">
<img src="{{avatar}}">
<p>{{username}}</p>
</div>
<div id="userFunctions" style="background-color:{{divColor 'dropdown'}}">
<div id="userFunctions" style="background-color:{{divColor 'userDropdownColor'}}">
<div id="myprofile" class="userFunction" onclick="window.location='/profile';">
<i class="fa fa-user" aria-hidden="true"></i>
<p>My Profile</p>
@ -251,7 +251,7 @@
</div>
{{/if}}
</div>
<div style="background-color:{{divColor 'dropdown'}}">
<div style="background-color:{{divColor 'userDropdownColor'}}">
<div id="myprofile" class="userFunction" onclick="document.getElementById('login-buttons-logout').click();">
<i class="fa fa-sign-out" aria-hidden="true"></i>
<p>Sign out</p>
@ -259,13 +259,13 @@
</div>
</div>
<div id="requests" style="bottom:{{requestStatus}};background-color:{{divColor 'cards'}}">
<div id="requestTab" style="background-color:{{divColor 'cards'}}">
<div id="requests" style="bottom:{{requestStatus}};background-color:{{divColor 'secondaryColor'}}">
<div id="requestTab" style="background-color:{{divColor 'secondaryColor'}}">
<i class="fa fa-question" aria-hidden="true"></i>
</div>
<p>Send an help request, feature, or bug report.</p>
<textarea id="requestArea" class="restrict" rows="4" cols="50" maxlength="500" placeholder="Enter request here..."></textarea><br>
<div id="requestCont" style="background-color:{{divColor 'cards'}}">
<div id="requestCont" style="background-color:{{divColor 'secondaryColor'}}">
<span id="requestrestrict">{{commentLength}}</span>
<div id="requestSubmit">Send</div>
</div>
@ -290,7 +290,7 @@
<template name="classesMode">
<div class="classWrapper">
<div class="mainClass" style="background-color:{{divColor 'classes'}}">
<div class="mainClass" style="background-color:{{divColor 'classCardColor'}}">
<div class="classInfo"> <!-- class color -->
<h3 class="mainClassName">{{name}}</h3>
<p class="mainClassHour">{{hour}}</p>

4
hourglass/client/main/main.js
View File

@ -92,7 +92,7 @@ Template.registerHelper('divColor', (div) => { // Reactive color changing based
});
Template.registerHelper('textColor', () => { // Reactive color for text.
document.getElementsByTagName("body")[0].style.color = themeColors[Session.get("user").preferences.theme].text;
document.getElementsByTagName("body")[0].style.color = themeColors[Session.get("user").preferences.theme].textColor;
return;
});
@ -310,7 +310,7 @@ Template.main.helpers({
},
modeStatus(status) { // Color status of display modes.
if (!Session.equals("mode",status)) return;
return themeColors[Session.get("user").preferences.theme].highlightText;
return themeColors[Session.get("user").preferences.theme].modeHighlight;
},
currMode(name) { // Status of display mode.
return Session.equals("mode",name);

58
hourglass/client/profile/profile.html
View File

@ -3,7 +3,7 @@
<div id="mainpage{{userProfile}}" onclick="window.location='/'"><h2>Main Page</h2></div>
<div id="logout2" onclick='document.getElementById("login-buttons-logout").click();'><h2>Logout</h2></div>
<div id="profWrapper">
<div id="profPage" style="background-color:{{divColor 'header'}};min-width:{{screen}}{{textColor}}{{loadNew}}">
<div id="profPage" style="background-color:{{divColor 'mainColor'}};min-width:{{screen}}{{textColor}}{{loadNew}}">
<div id="profMainContainer">
<div id="profTop">
<img id="profBanner" src='{{banner}}' alt="Banner">
@ -17,7 +17,7 @@
<div id="profCards">
<div id="cardColLeft">
<!-- Card 1 -->
<div id="profInfo" class="card" style="background-color:{{divColor 'cards'}}">
<div id="profInfo" class="card" style="background-color:{{divColor 'secondaryColor'}}">
<h3 class="profHea">About</h3>
<div id="about">
<div>
@ -31,16 +31,16 @@
<span class="change radio" re="readonly" id="grade">{{grade}}</span>
</div>
<div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">9th</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">10th</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">11th</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">12th</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">9th</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">10th</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">11th</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">12th</p>
</div>
</div>
</div>
</div>
<!-- Card 2 -->
<div id="profPreferences" class="card" style="background-color:{{divColor 'cards'}}">
<div id="profPreferences" class="card" style="background-color:{{divColor 'secondaryColor'}}">
<h3 class="profHea">Preferences</h3>
<div id="preferences">
<div class="radioContainer">
@ -49,8 +49,8 @@
<span class="change radio" re="readonly" id="prefTheme">{{pref 'theme'}}</span>
</div>
<div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Light</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Dark</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Light</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Dark</p>
</div>
</div>
<br>
@ -60,8 +60,8 @@
<span class="change radio" re="readonly" id="prefMode">{{pref 'mode'}}</span>
</div>
<div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Classes</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Calendar</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Classes</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Calendar</p>
</div>
</div>
<br>
@ -71,11 +71,11 @@
<span class="change radio" re="readonly" id="prefHide">{{pref 'timeHide'}}</span>
</div>
<div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">1 Day</p>
<P class="profOptionText" style="background-color:{{divColor 'header'}}">2 Days</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">1 Week</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">1 Month</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Never</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">1 Day</p>
<P class="profOptionText" style="background-color:{{divColor 'mainColor'}}">2 Days</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">1 Week</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">1 Month</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Never</p>
</div>
</div>
<br>
@ -85,8 +85,8 @@
<span class="change radio" re="readonly" id="prefDone">{{pref 'done'}}</span>
</div>
<div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Yes</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">No</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div>
</div>
<br>
@ -96,8 +96,8 @@
<span class="change radio" re="readonly" id="prefReport">{{pref 'hideReport'}}</span>
</div>
<div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Yes</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">No</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div>
</div>
</div>
@ -105,7 +105,7 @@
</div>
<div id="cardColRight">
<!-- Card 3 -->
<div id="profClasses" class="card" style="background-color:{{divColor 'cards'}};">
<div id="profClasses" class="card" style="background-color:{{divColor 'secondaryColor'}};">
<h3 class="profHea">Classes</h3>
<div id="classes">
<div id="profFunctions">
@ -195,17 +195,17 @@
<p class="profTitle">Privacy:</p>
<input class="creInput radio op" type="text" name="privacy" readonly>
<div class="profOptions creOp">
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Public</p>
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Private</p>
<p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Public</p>
<p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Private</p>
</div>
</div>
<div class="formDiv">
<p class="profTitle">Category:</p>
<input class="creInput radio op" type="text" name="category" readonly>
<div class="profOptions creOp">
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Class</p>
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Club</p>
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Other</p>
<p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Class</p>
<p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Club</p>
<p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Other</p>
</div>
</div>
</div>
@ -220,7 +220,7 @@
</div>
</div>
<div class="overlay">
<div class="overlayCont" style="background-color:{{divColor 'header'}}">
<div class="overlayCont" style="background-color:{{divColor 'mainColor'}}">
<p>{{confirmText}}</p>
<div id="faCont">
<i class="fa fa-check-circle-o" aria-hidden="true"></i>
@ -229,7 +229,7 @@
</div>
</div>
<div id="createdClasses" style="background-color:{{divColor 'cards'}};right:{{ownedStatus}}" classid="{{selectedClass '_id'}}">
<div id="createdClasses" style="background-color:{{divColor 'secondaryColor'}};right:{{ownedStatus}}" classid="{{selectedClass '_id'}}">
<h3>{{selectedClass 'name'}}</h3>
<h4 id="codetext">Code:</h4>
<input id="code" value="{{selectedClass 'code'}}" type="text" readonly>
@ -266,7 +266,7 @@
<div id="deleteClass">Delete Class</div>
</div>
<div id="joinPrivClass" style="background-color:{{divColor 'cards'}};bottom:{{privStatus}}">
<div id="joinPrivClass" style="background-color:{{divColor 'secondaryColor'}};bottom:{{privStatus}}">
<h3>Enter Code:</h3>
<input id="privateCode" type="text" placeholder="Enter code here...">
<h4 id="privSubmit">Submit</h4>

2
hourglass/client/profile/profile.js
View File

@ -118,7 +118,7 @@ Template.profile.helpers({
},
profClassTabColor(status) { // Change this [Supposed to show the current mode that's selected via color]    
if (Session.equals("profClassTab",status)) {            
return themeColors[Meteor.user().profile.preferences.theme].highlightText;        
return themeColors[Meteor.user().profile.preferences.theme].modeHighlight;        
} else {            
return;        
}    

105
hourglass/lib/constants.js
View File

@ -1,78 +1,69 @@
themeColors = {
"light": {
"background": "White.jpg",
"header": "#EBEBEB",
"sidebar": "#65839A",
"dropdown": "#E6E6E6",
"funcButton": "#849CAE",
"statusIcons": "#33ADFF",
"highlightText": "#FF1A1A",
"cards": "#FEFEFE",
"classes":"#EBEBEB",
"calendar": "#000",
"text": "#000"
"mainColor": "#EBEBEB",
"secondaryColor": "#FEFEFE",
"sidebarColor": "#65839A",
"userDropdownColor": "#E6E6E6",
"iconHighlight": "#33ADFF",
"modeHighlight": "#FF1A1A",
"classCardColor":"#EBEBEB",
"textColor": "#000"
},
/*"dark": {
"background": "Black.jpg",
"header": "#373A56",
"sidebar": "#35435D",
"dropdown": "#373A56",
"funcButton": "#5D75A2",
"statusIcons": "#33ADFF",
"highlightText": "#FF1A1A",
"cards": "#151A2B",
"classes":"#46396E",
"calendar": "#000",
//30313B
"text": "#F6F6F6"
"mainColor": "#373A56",
"secondaryColor": "#151A2B",
"sidebarColor": "#35435D",
"userDropdownColor": "#373A56",
"iconHighlight": "#33ADFF",
"modeHighlight": "#FF1A1A",
"classCardColor":"#46396E",
"textColor": "#F6F6F6"
},*/
/*"dark": {
"background": "RedBlack.png",
"header": "#302c36",
"sidebar": "#327c5a",
"dropdown": "#cc3333",
"statusIcons": "#327c5a",
"highlightText": "#c9fe62",
"cards": "#151313",
"classes":"#302c36",
"calendar": "#000",
"text": "#fcf0f0"
"mainColor": "#302c36",
"secondaryColor": "#151313",
"sidebarColor": "#327c5a",
"userDropdownColor": "#cc3333",
"iconHighlight": "#327c5a",
"modeHighlight": "#c9fe62",
"classCardColor":"#302c36",
"textColor": "#fcf0f0"
},*/
/*"dark": {
"background": "Sea.png",
"header": "#1e926c",
"sidebar": "#3cb08a",
"dropdown": "#2ea96a",
"statusIcons": "#61d9a3",
"highlightText": "#c9fe62",
"cards": "#1c564f",
"classes":"#2567a1",
"calendar": "#000",
"text": "#fcf0f0"
"mainColor": "#1e926c",
"secondaryColor": "#1c564f",
"sidebarColor": "#3cb08a",
"userDropdownColor": "#2ea96a",
"iconHighlight": "#61d9a3",
"modeHighlight": "#c9fe62",
"classCardColor":"#2567a1",
"textColor": "#fcf0f0"
},*/
/*"dark": {
"background": "Earth.png",
"header": "#dea743",
"sidebar": "#6d9957",
"dropdown": "#89bb52",
"statusIcons": "#91ee61",
"highlightText": "#b9f643",
"cards": "#496234",
"classes":"#c18311",
"calendar": "#000",
"text": "#fcf0f0"
"mainColor": "#dea743",
"secondaryColor": "#496234",
"sidebarColor": "#6d9957",
"userDropdownColor": "#89bb52",
"iconHighlight": "#91ee61",
"modeHighlight": "#b9f643",
"classCardColor":"#c18311",
"textColor": "#fcf0f0"
},*/
"dark": {
"background": "NeonBlue.png",
"header": "#1d1c23",
"sidebar": "#312e32",
"dropdown": "#2e312b",
"statusIcons": "#70e6e6",
"highlightText": "#70e6e6",
"cards": "#1f212f",
"classes":"#1faab1",
"calendar": "#000",
"text": "#fcf0f0"
"mainColor": "#1d1c23",
"secondaryColor": "#1f212f",
"sidebarColor": "#312e32",
"userDropdownColor": "#2e312b",
"iconHighlight": "#70e6e6",
"modeHighlight": "#70e6e6",
"classCardColor":"#1faab1",
"textColor": "#fcf0f0"
}
};