Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
Omnimaga
/
OmnomIRC-node
spogulis no [email protected]:Omnimaga/OmnomIRC-node.git
2
0
Atdalīts 0
Faili Problēmas 0 Vikivietne
Pārlūkot izejas kodu

Reverted files to avoid pull conflicts

Eiyeron 10 gadi atpakaļ
vecāks
6eb273cbb1
revīzija
cb900e30c9
3 mainītis faili ar 29 papildinājumiem un 109 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 2
      app/OmnomIRC.js
  2. 24 103
      app/www/data/themes/default/style.css
  3. 4 4
      app/www/index.html

+ 1 - 2
app/OmnomIRC.js
Parādīt failu 

@@ -96,7 +96,6 @@ if(cluster.isMaster){
 
 						if(stats.isFile()){
 
 							var fileStream,
 
 								mimetype = mimeTypes[path.extname(filename).split('.')[1]];
 
-
 
 							res.writeHead(200,{
 
 								'Content-Type': mimetype
 
 							});
 
@@ -304,4 +303,4 @@ process.on('uncaughtException',function(e){
 
 	}else{
 
 		console.error(e);
 
 	}
 
-});
 
+});

+ 24 - 103
app/www/data/themes/default/style.css
Parādīt failu 

@@ -7,11 +7,6 @@ html,body{
 
 }
 
 .unselectable{
 
 	cursor: default;
 
-	display: block;
 
-	margin: auto;
 
-	margin-bottom: 1em;
 
-	vertical-align: middle;
 
-	text-align: center;
 
 }
 
 .fill{
 
 	width: 100%;
 
@@ -42,9 +37,6 @@ html,body{
 
 	font-size: 24px;
 
 	margin-top: -5px;
 
 	font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
 
-    line-height: 17px;
 
-    margin-top: 0;
 
-    display: block;
 
 	cursor: pointer;
 
 }
 
 .close-button:hover{
 
@@ -59,9 +51,6 @@ html,body{
 
 	background-color: white;
 
 	transition: height 0.3s;
 
 	z-index: 10;
 
-    font-size: 10px;
 
-    font-family:verdana,sans-serif;
 
-    background-color: #DFEFFF;
 
 }
 
 #info{
 
 	display: table;
 
@@ -79,27 +68,8 @@ html,body{
 
 	height: calc(100% - 61px);
 
 	top: 41px;
 
 	left: 0;
 
-    font-size: 10px;
 
-    font-family:verdana,sans-serif;
 
-    line-height:13px;
 
-    background-color: #DFEFFF;
 
 }
 
-#content-list li:nth-child(even) {
 
-    background-color: #cae4ff;
 
-}
 
-#content-list a, #content-list a:hover, #content-list a:active , #content-list a:active, #content-list a:link {
 
-	color:blue;
 
-	text-decoration: none;
 
-	border-bottom: 1px solid rgba(0, 0, 255, 0.3);
 
-
 
-}
 
-#content-list a:hover {
 
-	text-decoration: none;
 
-	text-shadow: 0 0 4px rgba(0, 40, 170, 0.5);
 
-}
 
-
 
 #console-log{
 
-    font-size: 14px;
 
 	display: none;
 
 }
 
 #console-log-pre{
 
@@ -113,12 +83,9 @@ html,body{
 
 	width: 100%;
 
 	overflow: hidden;
 
 }
 
-
 
 #settings,#users{
 
-	font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
 
-	font-size: 12px;
 
 	bottom: 0;
 
-	height: 19px;
 
+	height: 18px;
 
 	background-color: white;
 
 	border-left-style: solid;
 
 	border-top-style: solid;
 
@@ -138,15 +105,11 @@ html,body{
 
 	right: 0;
 
 	width: 36px;
 
 	z-index: 1;
 
-	background-color: #cae4ff;
 
 }
 
 #settings{
 
-	width: 50px;
 
-    border-top-color: rgba(102, 153, 255, 0.6);
 
+	width: 52px;
 
 	border-right-style: solid;
 
 	right: 36px;
 
-	background-color: #cae4ff;
 
-
 
 }
 
 #settings.hovered,#users.hovered{
 
 	height: 21px;
 
@@ -160,63 +123,44 @@ html,body{
 
 #settings.open{
 
 	width: 300px;
 
 }
 
-
 
-#settings input, #settings select {
 
-	background-color: #DFEFFF;
 
-	border-radius: 2px;
 
-	border: solid 1px rgba(102, 153, 255, 0.9);
 
-
 
-}
 
 #entry{
 
 	width: 100%;
 
 	border-top-style: solid;
 
-	height: 19px;
 
+	height: 18px;
 
 	bottom: 0;
 
-
 
 }
 
 #input{
 
 	width: calc(100% - 126px);
 
-	height: 17px;
 
+	height: 16px;
 
 	margin: 0;
 
 	padding: 1px;
 
 	border-style: none;
 
+	background-color: grey;
 
 	clear: none;
 
 	bottom: 0;
 
 	left: 0;
 
-	background-color: #cae4ff;
 
 }
 
 #send{
 
-
 
 	clear: none;
 
 	bottom: 0;
 
 	right: 88px;
 
-	width: 48px;
 
+	width: 36px;
 
 	padding: 0;
 
-	padding-bottom: 4px;
 
 	margin: 0;
 
-	height: 19px;
 
+	height: 18px;
 
 	border-style: none;
 
-	border-left: 1px solid;
 
-	background-color: #cae4ff;
 
+	border-left-style: solid;
 
+	background-color: white;
 
 	transition: background-color 0.2s;
 
-	font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
 
-	font-size: 12px;
 
-	vertical-align: top;
 
-	text-align: center;
 
 }
 
 #send:hover{
 
-	background-color: #DFEFFF;
 
+	background-color: grey;
 
 }
 
 #send.clicked{
 
-	background-color: rgba(102, 153, 255, 0.9);
 
-}
 
-#popup-title, #send {
 
-	font-variant: small-caps;
 
+	background-color: red;
 
 }
 
-
 
 #console-log,#content,#head,#users,#entry,#input,#send,#settings{
 
- 	border-color: rgba(102, 153, 255, 0.6);
 
- 	border-top-color: rgba(102, 153, 255, 0.9);
 
+	border-color: black;
 
 	border-width: 1px;
 
 	position: absolute;
 
 	overflow: hidden;
 
@@ -248,14 +192,7 @@ html,body{
 
 	line-height: 4px;
 
 }
 
 #user-list{
 
-	font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
 
-	font-size: 15px;
 
-}
 
-#user-list li:nth-child(even){
 
-    background-color: #DFEFFF;
 
-    border: solid 1px #6699ff;
 
-    border-left: 0px;
 
-    border-right: 0px;
 
+	padding-left: 5px;
 
 }
 
 #tabs-list{
 
 	width: calc(100% - 42px);
 
@@ -267,16 +204,14 @@ html,body{
 
 }
 
 #tabs-list div.tab{
 
 	float: left;
 
+	min-width: 100px;
 
 	max-width: 200px;
 
+	height: 19px;
 
 	overflow: hidden;
 
 	position: relative;
 
-    height: 18px;
 
-    margin-bottom: -1px;
 
 }
 
 #tabs-list div.tab.clicked{
 
-    background-color: #cae4ff;
 
-    border: solid 1px #6699ff;
 
-	border-bottom-width: 0px;
 
+	background-color: lightgrey;
 
 }
 
 #tabs-scroll-left{
 
 	position: absolute;
 
@@ -293,38 +228,24 @@ html,body{
 
 	width: 20px;
 
 }
 
 #tabs-list div.tab, #tabs-scroll-right,#tabs-scroll-left{
 
+	border-style: solid;
 
 	border-top-right-radius: 3px;
 
 	border-top-left-radius: 3px;
 
-    border: 1px solid rgba(102, 153, 255, 0.3);
 
-    border-top-color: rgba(102, 153, 255, 0.6);
 
+	border-color: black;
 
+	border-top-style: solid;
 
+	border-right-style: solid;
 
+	border-left-style: solid;
 
+	border-bottom-style: none;
 
 	border-width: 1px;
 
-	border-bottom-width: 0px;
 
 	padding: 0;
 
 	margin: 0;
 
 	background-color: white;
 
 	cursor: pointer;
 
 	clear: none;
 
-
 
-    display: block;
 
-    -webkit-box-align: center;
 
-    -moz-box-align: center;
 
-    box-align: center;
 
-    text-align: center;
 
-    vertical-align: center;
 
-    line-height: 16px;
 
-    background-color: #DFEFFF;
 
-
 
-}
 
-
 
-#tabs-list div.tab{
 
-    padding-right: 15px;
 
 }
 
 #tabs-list div.tab:hover, #tabs-scroll-right:hover,#tabs-scroll-left:hover{
 
-    background-color: #cae4ff;
 
+	background-color: grey;
 
 }
 
 #tabs-scroll-left.disabled, #tabs-scroll-right.disabled{
 
-    background-color: #cae4ff;
 
-    border: solid 1px #6699ff;
 
-	border-bottom-width: 0px;
 
-
 
+	background-color: lightgrey;
 
 }

+ 4 - 4
app/www/index.html
Parādīt failu 

@@ -36,18 +36,18 @@
 
 		</div>
 
 		<div id="entry">
 
 			<input id="input" type="text"/>
 
-			<button id="send" value="send">Send</button>
 
+			<button id="send" value="send">send</button>
 
 			<div id="users">
 
-				<span class="unselectable"><span id="popup-title">Users</span></span>
 
+				<span class="unselectable">Users</span>
 
 				<span class="close-button">&times;</span>
 
 				<ul id="user-list"></ul>
 
 			</div>
 
 			<div id="settings">
 
-				<span class="unselectable"><span id="popup-title">Settings</span></span>
 
+				<span class="unselectable">Settings</span>
 
 				<span class="close-button">&times;</span>
 
 				<ul id="settings-list"></ul>
 
 			</div>
 
 		</div>
 
 		<div id="console-log"></div>
 
 	</body>
 
-</html>
 
+</html>