Commits

Christian Kaula committed 3290c7e

updated squader to 1.1

  • Participants
  • Parent commits cb7a246

Comments (0)

Files changed (4)

File Squader.AdiumMessageStyle/Contents/Info.plist

 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Squader 1.0</string>
+	<string>Squader 1.1</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.adiumx.squader.style</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleName</key>
 	<string>Squader</string>
 	<key>CFBundlePackageType</key>

File Squader.AdiumMessageStyle/Contents/Resources/Context_Mockup.html

 				<span class="sender">SomeoneElse:</span>
 			    <span class="content">Hello? Are you there Me? You should check out <a href="http://adium.sourceforge.net">Adium X</a> if you haven't. It's way cool. <a href="http://nowhere.anywhere.atall/that/you/can/not/getto.xyz">Nowhere</a>, too, since you can never visit it.</span>
 			</div>
+			<div class="incoming message consecutive mention">
+			    <span class="time">14:25:39</span>
+				<span class="sender">SomeoneElse:</span>
+			    <span class="content">Hello? Are you there Me? You should check out <a href="http://adium.sourceforge.net">Adium X</a> if you haven't. It's way cool. <a href="http://nowhere.anywhere.atall/that/you/can/not/getto.xyz">Nowhere</a>, too, since you can never visit it.</span>
+			</div>
 
 			<div class="outgoing message">
 			    <span class="time">14:25:50</span>

File Squader.AdiumMessageStyle/Contents/Resources/main.css

 body {
   margin: 4px 0 5px 0;
   color: #393a39;
-  background-color: white;
   font-family: "Helvetica Neue", Helvetica, arial, sans-serif;
   font-size: 13px;
   padding: 0px 1px 1px 1px; }
 
-.content {
-  display: block;
-  padding-top: 1px;
-  margin: -1em 0 0 115px; }
-
 .event,
 .message,
 .status {
-  overflow: hidden;
-  zoom: 1;
   padding: 5px 0; }
+  .event.consecutive,
+  .message.consecutive,
+  .status.consecutive {
+    padding-top: 0; }
 
-.history {
-  opacity: 0.75; }
-
-.message {
-  position: relative;
-  border-top: 1px solid #e6e6e6; }
-  .message .time {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    font-weight: bold;
-    font-size: 1.2em;
-    color: rgba(50, 50, 50, 0.05); }
-  .message:hover .time {
-    color: #e6e6e6;
-    -webkit-transition: color 0.1s linear; }
-  .message.consecutive .sender {
-    visibility: hidden; }
-  .message.incoming a:link, .message.incoming a:hover, .message.incoming a:visited {
-    color: #c44d55; }
-  .message.incoming .sender {
-    color: #c44d55; }
-  .message.outgoing {
-    background: rgba(50, 50, 50, 0.05); }
-    .message.outgoing a:link, .message.outgoing a:hover, .message.outgoing a:visited {
-      color: #4c6d84; }
+.message:hover .time {
+  z-index: -10;
+  color: #e6e6e6; }
+.message.consecutive .sender {
+  visibility: hidden; }
+.message.incoming a:link, .message.incoming a:hover, .message.incoming a:visited {
+  color: #c44d55; }
+.message.incoming .sender {
+  color: #c44d55; }
+.message.outgoing {
+  background: rgba(50, 50, 50, 0.05); }
+  .message.outgoing a:link, .message.outgoing a:hover, .message.outgoing a:visited {
+    color: #4c6d84; }
+  .message.outgoing .sender {
+    color: #4c6d84; }
+.message .content {
+  display: table-cell;
+  padding-right: 10px; }
+.message .sender {
+  width: 95px;
+  text-align: right;
+  display: table-cell;
+  padding-left: 5px;
+  padding-right: 10px;
+  font-weight: bold; }
+.message .time {
+  display: block;
+  position: absolute;
+  right: 0;
+  font-weight: bold;
+  font-size: 1.2em;
+  color: rgba(50, 50, 50, 0.05); }
 
 .event,
 .status {
-  font-weight: bold; }
-  .event.away,
-  .status.away {
-    background: #ffe5e0;
-    color: #e8745e; }
+  font-weight: bold;
+  color: #828282; }
+  .event.date_separator,
+  .status.date_separator {
+    background: #d8eaf7;
+    color: #4c6d84; }
   .event.date_separator,
   .status.date_separator {
     background: #d8eaf7;
   .status.online {
     background: #d8f4cc;
     color: #57774a; }
-
-.sender,
-.event .time,
-.status .time {
-  width: 92px;
-  padding-left: 8px;
-  margin-right: 15px;
-  height: 1em;
-  display: block;
-  overflow: hidden;
-  font-weight: bold;
-  text-align: right; }
-
-.sender {
-  color: #4c6d84; }
+  .event .content,
+  .event .time,
+  .status .content,
+  .status .time {
+    display: table-cell; }
+  .event .time,
+  .status .time {
+    width: 95px;
+    text-align: right;
+    display: table-cell;
+    padding-left: 5px;
+    padding-right: 10px; }

File Squader.AdiumMessageStyle/Contents/Resources/main.sass

-$width-nick: 92px
+$width-nick: 95px
 
 $color: rgba(57, 58, 57, 1.0)
 $color-light: rgba(230, 230, 230, 1.0)
 
 $color-blue: rgba(76, 109, 132, 1.0)
 // $color-blue-light: rgba(212, 233, 248, 1.0)
+$color-blueish: rgba(84, 187, 206, 1.0)
 $color-green: rgba(87, 119, 74, 1.0)
 // $color-green-light: rgba(222, 248, 212, 1.0)
 $color-purple: rgba(155, 81, 155, 1.0)
+$color-orangeish: rgba(232, 151, 123, 1.0)
 $color-red: rgba(196, 77, 85, 1.0)
 // $color-red-light: rgba(255, 219, 214, 1.0)
 $color-redish: rgba(232, 116, 94, 1.0)
 $color-yellow: rgba(217, 130, 0, 1.0)
+$color-yellowish: rgba(232, 192, 114, 1.0)
 
 $color-in: $color-red
 $color-out: $color-blue
 
 $color-away: $color-redish
+$color-away-return: $color-blueish
 $color-date: $color-blue
 $color-error: $color-yellow
 $color-event: $color-blue
+$color-idle: $color-orangeish
 $color-online: $color-green
+$color-status: rgb(130, 130, 130)
 
 
 
 	zoom: 1
 
 
-=col-left
-	width: 92px
-	padding-left: 8px
-	margin-right: 15px
+@mixin col-left
+	width: $width-nick
+	text-align: right
+	display: table-cell
+	padding-left: 5px
+	padding-right: 10px
+	
 
 
-=setup-event($clr, $lighten=50, $saturate=40)
+@mixin setup-event($clr, $lighten: 50, $saturate: 40)
 	background: saturate(lighten($clr, $lighten), $saturate)
 	color: $clr
 
 body
 	margin: 4px 0 5px 0
 	color: $color
-	background-color: white
+	//background-color: white
 	font-family: "Helvetica Neue", Helvetica, arial, sans-serif
 	font-size: 13px
 	padding: 0px 1px 1px 1px
 
 
-.content
-	display: block
-	padding-top: 1px
-	margin: -1em 0 0 115px
-
-
 
 .event,
 .message,
 .status
-	+clearfix
 	padding: 5px 0
+	// margin: 10px 0
+	// margin: 5px 0
+	
+	&.consecutive
+		padding-top: 0
+		// margin-top: -5px
 
 
-
-.history
-	opacity: 0.75
-
+// .message,
+// .status
+// 	display: table-row
 
 
 .message
-	position: relative
-	border-top: 1px solid $color-light
-
-	.time
-		position: absolute
-		right: 0
-		bottom: 0
-		font-weight: bold
-		font-size: 1.2em
-		color: $color-lighter
 
 	&:hover
 		.time
+			z-index: -10
 			color: $color-light
-			-webkit-transition: color .1s linear
+	
+	&.consecutive
 
-	&.consecutive
 		.sender
 			visibility: hidden
 
 		.sender
 			color: $color-in
 
-
 	&.outgoing
 		background: $color-lighter
 
 			&:hover,
 			&:visited
 				color: $color-out
+		
+		.sender
+			color: $color-out
 
+	.content
+		display: table-cell
+		padding-right: 10px
+	
+	.sender
+		+col-left
+		font-weight: bold
+	
+	.time
+		display: block
+		position: absolute
+		right: 0
+		font-weight: bold
+		font-size: 1.2em
+		color: $color-lighter
 
 
 .event,
 .status
 	font-weight: bold
+	color: $color-status
+	
+	// &:hover
+	// 	.time
+	// 		// z-index: -10
+	// 		color: $color-light
+	// 		// -webkit-transition: color .1s linear
 
-	&.away
-		+setup-event($color-away, 30)
+	&.date_separator
+		+setup-event($color-date)
+
+	// &.away,
+	// &.idle
+	// 	+setup-event($color-away, 30)
 
 	&.date_separator
 		+setup-event($color-date)
 	&.error
 		+setup-event($color-error)
 
-	&.idle
-		// +setup-event($color-)
+	// &.idle
+	// 	// +setup-event($color-idle, 28)
+	// 	opacity: 0.5
 
 	&.offline
 		+setup-event(complement($color-online))
 	&.online
 		+setup-event($color-online)
 
-	&.return_idle
+	// &.return_away,
+	// &.return_idle
+	// 	+setup-event($color-away-return, 35)
+	
+	// &.return_idle
+	// 	// +setup-event(complement($color-idle), 30)
+	// 	opacity: 0.5
+	
+	.content,
+	.time
+		display: table-cell
+	
+	.time
+		+col-left
+		// width: 95px
+		// padding-right: 10px
+		// text-align: right
 
 
-
-.sender,
-.event .time,
-.status .time
-	+col-left
-	height: 1em
-	display: block
-	overflow: hidden
-	font-weight: bold
-	text-align: right
-
-
-
-.sender
-	color: $color-out
+// .content
+// 	display: table-cell
+// 	// padding-top: 1px
+// 	margin: -1em 0 0 115px
+// 
+// 
+// .event,
+// .message,
+// .status
+// 	+clearfix
+// 	padding: 5px 0
+// 
+// 
+// 
+// .history
+// 	opacity: 0.7
+// 
+// 
+// 
+// .message
+// 	display: table-row
+// 	// position: relative
+// 	//border-top: 1px solid $color-light
+// 
+// 	.time
+// 		position: absolute
+// 		right: 0
+// 		bottom: 0
+// 		font-weight: bold
+// 		font-size: 1.2em
+// 		color: $color-lighter
+// 
+// 	&:hover
+// 		.time
+// 			color: $color-light
+// 			-webkit-transition: color .1s linear
+// 
+// 	&.consecutive
+// 		.sender
+// 			visibility: hidden
+// 
+// 	&.incoming
+// 
+// 		a
+// 			&:link,
+// 			&:hover,
+// 			&:visited
+// 				color: $color-in
+// 
+// 		.sender
+// 			color: $color-in
+// 
+// 
+// 	&.outgoing
+// 		background: $color-lighter
+// 
+// 		a
+// 			&:link,
+// 			&:hover,
+// 			&:visited
+// 				color: $color-out
+// 
+// 
+// 
+// .event,
+// .status
+// 	font-weight: bold
+// 
+// 	&.away,
+// 	&.idle
+// 		+setup-event($color-away, 30)
+// 
+// 	&.date_separator
+// 		+setup-event($color-date)
+// 
+// 	&.error
+// 		+setup-event($color-error)
+// 
+// 	&.idle
+// 		// +setup-event($color-idle, 28)
+// 		opacity: 0.5
+// 
+// 	&.offline
+// 		+setup-event(complement($color-online))
+// 
+// 	&.online
+// 		+setup-event($color-online)
+// 
+// 	&.return_away,
+// 	&.return_idle
+// 		+setup-event($color-away-return, 35)
+// 	
+// 	&.return_idle
+// 		// +setup-event(complement($color-idle), 30)
+// 		opacity: 0.5
+// 
+// 
+// 
+// .sender,
+// .event .time,
+// .status .time
+// 	+col-left
+// 	height: 1em
+// 	// display: block
+// 	overflow: hidden
+// 	font-weight: bold
+// 	text-align: right
+// 
+// 
+// 
+// .sender
+// 	color: $color-out
+// 
+// .time
+// 	margin-top: 1px