Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@deeheem
deeheem committed Mar 3, 2018
2 parents 307dedc + 211952b commit f67a801
Show file tree
Hide file tree
Showing 15 changed files with 6,485 additions and 28 deletions.
125 changes: 125 additions & 0 deletions code/css/calculator.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@


/*Calculator CSS*/


.modal-content
{
width: fit-content;
max-height: 300px;

}
#calculator {
width: 325px;
height: auto;
padding: 20px 20px 9px;
background: #9dd2ea;
background: linear-gradient(#9dd2ea, #8bceec);
border-radius: 3px;
box-shadow: 0px 4px #009de4, 0px 10px 15px rgba(0, 0, 0, 0.2);
}

.top span.clear {
float: left;
}

.top .screen {
height: 40px;
width: 212px;

float: right;

padding: 0 10px;

background: rgba(0, 0, 0, 0.2);
border-radius: 3px;
box-shadow: inset 0px 4px rgba(0, 0, 0, 0.2);

font-size: 17px;
line-height: 40px;
color: white;
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
text-align: right;
letter-spacing: 1px;
}

.keys, .top {overflow: hidden;}

.keys span, .top span.clear {
float: left;
position: relative;
top: 0;

cursor: pointer;

width: 66px;
height: 36px;

background: white;
border-radius: 3px;
box-shadow: 0px 4px rgba(0, 0, 0, 0.2);

margin: 0 5px 11px 0;

color: #888;
line-height: 36px;
text-align: center;

user-select: none;

transition: all 0.2s ease;

}
.keys span.eval{
width : 280px;
}
.keys span.operator {
background: rgba(255, 216, 221, 1);
}

.keys span.eval {
background: #f1ff92;
box-shadow: 0px 4px #9da853;
color: #888e5f;
}

.top span.clear {
background: #ff9fa8;
box-shadow: 0px 4px #ff7c87;
color: white;
}

/* Some hover effects */
.keys span:hover {
background: #9c89f6;
box-shadow: 0px 4px #6b54d3;
color: white;
}

.keys span.eval:hover {
background: #abb850;
box-shadow: 0px 4px #717a33;
color: #ffffff;
}

.top span.clear:hover {
background: #f68991;
box-shadow: 0px 4px #d3545d;
color: white;
}

.keys span:active {
box-shadow: 0px 0px #6b54d3;
top: 4px;
}

.keys span.eval:active {
box-shadow: 0px 0px #717a33;
top: 4px;
}

.top span.clear:active {
top: 4px;
box-shadow: 0px 0px #d3545d;
}

17 changes: 14 additions & 3 deletions code/css/popup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ html {
height: 24px;
font-size: 12px;
}

.fa {

.fa {

font-size: 15px;
cursor: pointer;
user-select: none;
Expand All @@ -65,7 +66,6 @@ html {
.checked {
color: orange;
}


.card-title{
font-size: 20px;
Expand Down Expand Up @@ -144,4 +144,15 @@ hr {
margin:10px -50px;
border:0;
border-top:1px solid #ccc
}

.dropdown_button
{
background-color: Transparent;
background-repeat:no-repeat;
border: none;
cursor:pointer;
overflow: hidden;
outline:none;
color: #077bff;
}
38 changes: 38 additions & 0 deletions code/css/stopwatch.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*Stopwatch Css*/

@mixin transition {
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
}
@mixin corners ($radius) {
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
border-radius: $radius;
-khtml-border-radius: $radius;
}
#seconds, #tens{
font-size:2em;
}

.stopW_btn
{

width: 66px;
height: 36px;
border-radius: 3px;
background: #ff9fa8;
color: white;
margin: 0 5px 11px 0;
box-shadow: 0px 0px #d3545d;
line-height: 36px;
text-align: center;
user-select: none;
transition: all 0.2s ease;
}

.stopW_btn:hover {
background: #ff707d;
box-shadow: 0px 4px #e4d6d8;
color: #ffffff;
}
107 changes: 107 additions & 0 deletions code/css/timezone.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@


/*Time Zone Converter CSS*/



#myInput {
border-box: box-sizing;
background-image: url('../image/searchicon.png');
background-position: 14px 12px;
background-repeat: no-repeat;
font-size: 16px;
padding: 14px 20px 12px 45px;
border: none;
border-bottom: 1px solid #ddd;
}
#myInput:focus {outline: 3px solid #ddd;}



#myInput2 {
border-box: box-sizing;
background-image: url('../image/searchicon.png');
background-position: 14px 12px;
background-repeat: no-repeat;
font-size: 16px;
padding: 14px 20px 12px 45px;
border: none;
border-bottom: 1px solid #ddd;
}
#myInput2:focus {outline: 3px solid #ddd;}



.tzconvert
{
margin: 20px;
}
#myDropdown button , #myDropdown2 button
{
background-color: #ff9fa8;
color: white;
}
#h1 , #m1
{
text-align: center;
}
#main_drop_menu li
{
text-align: center;
padding-left: 0px;
}
li { cursor: pointer; }

#help_popup {
width:100%;
height:100%;
opacity:.99;
top:0;
left:0;
display:none;
position:fixed;
background-color:#313131;
overflow:auto
}

img#close {
position:absolute;
right:-14px;
top:-14px;
cursor:pointer
}

div#popup {
position:absolute;
left:50%;
top:17%;
margin-left:-402px;
}

form {
max-width:800px;
min-width:400px;
padding:10px 50px;
border:2px solid gray;
border-radius:10px;
background-color:#fff
}

h2 {
background-color:#fcee45;
padding:20px 35px;
margin:-10px -50px;
text-align:center;
border-radius:10px 10px 0 0
}

h4 {
text-align:justify;
}

hr {
margin:10px -50px;
border:0;
border-top:1px solid #ccc
}

Binary file added code/image/searchicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions code/js/addOfflineApps.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

$(document).ready(function() {


/*Calculator Modal Add*/

var modal = '<div class="modal fade" id="myModal" role="dialog" style="left: 17%;"><div class="modal-dialog ">';
var modal_content= '<div class="modal-content" style="display: block;"><div class="modal-header"><h4 class="modal-title">Calculator</h4><button type="button" class="close" data-dismiss="modal">&times;</button></div>';
var modal_body = ' <div class="modal-body" id="calculator"><div class="top"><span class="clear">C</span><div class="screen" id="result"></div></div>';
var keys = '<div class="keys"><span class="press_btn">7</span><span class="press_btn">8</span><span class="press_btn press_btn">9</span><span class="operator press_btn">+</span><span class="press_btn">4</span><span class="press_btn">5</span><span class="press_btn">6</span><span class="operator press_btn">-</span><span class="press_btn">1</span><span class="press_btn">2</span><span class="press_btn">3</span><span class="operator press_btn">/</span><span class="press_btn">0</span><span class="press_btn">.</span><span class="operator press_btn">*</span><span class="operator press_btn">^</span><span class="eval" id="calculate" >=</span></div>';
var end_divs = '</div></div></div></div>';

$('#calculator_modal').append(modal+modal_content+modal_body+keys+end_divs);

/* StopWatch Modal Add */

var modal2 ='<div class="modal fade" id="myModal2" role="dialog" style="left: 17%;"><div class="modal-dialog ">';
var modal_content2 = ' <div class="modal-content"><div class="modal-header"><h4 class="modal-title">Stopwatch</h4><button type="button" class="close" data-dismiss="modal">&times;</button></div><div class="modal-body" id="stopwatch"><div style="text-align: center;"><p><span id="seconds">00</span><span style="font-size: 2em;"> : </span> <span id="tens">00</span></p><button id="button-start" class="stopW_btn">Start</button><button id="button-stop" class="stopW_btn">Stop</button><button id="button-reset" class="stopW_btn">Reset</button></div></div></div></div></div>';

$('#stopwatch_modal').append(modal2 + modal_content2);



/* Time Zone Converter Modal Add */


var modal3 = '<div class="modal fade" id="myModal3" role="dialog" style="left: 17%;"><div class="modal-dialog ">';
var modal_content3 = '<div class="modal-content">';
var modal_header3 = '<div class="modal-header"><h4 class="modal-title">Time Zone Converter</h4><button type="button" class="close" data-dismiss="modal">&times;</button></div>';
var modal_body3 = '<div class="modal-body row" id="timeZone_converter">';
var row_start = '<div class="row" style="margin: 5px;">';
var modal_class1 = '<div class="col-sm-6" style="text-align: center;"><input id="h1" type="number" name="hour1" min="0" max="23" value="00"></input><span>:</span><input id="m1" type="number" name="min1" min="0" max="59" value="00"><br><br><div class="dropdown" id="myDropdown"><button class="btn dropdown-toggle " type="button" data-toggle="dropdown" id="drop_button">Time Zone 1<span class="caret"></span></button><ul class="dropdown-menu TimeZoneNames pre-scrollable"><input type="text" placeholder="Search.." id="myInput" ></ul></div></div>';
var modal_class2 = '<div class="col-sm-6" style="text-align: center;"><label id="h2">00</label><span>:</span><label id="m2">00</label><br><br>';
var row_stop ='</div>'
var modal_class3 = '<div class="dropdown" id="myDropdown2"><button class="btn dropdown-toggle " type="button" data-toggle="dropdown" id="drop_button2">Time Zone 2<span class="caret"></span></button><ul class="dropdown-menu TimeZoneNames2 pre-scrollable"><input type="text" placeholder="Search.." id="myInput2" ></ul></div></div><br><br><br></div><button class="btn tzconvert">Convert</button></div></div></div>';

$('#timeZone_converter_modal').append(modal3 + modal_content3 + modal_header3 +row_start+ modal_class1 +modal_class2 +modal_class3+row_stop);



});
7 changes: 7 additions & 0 deletions code/js/bootstrap.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit f67a801

Please sign in to comment.