Merge pull request #3 from TempSpas/v7.0.7-changes

V7.0.7 changes

Data/Settings/styleSettings.plist

@@ -5,7 +5,7 @@
     <key>Template Engine Versions</key>
     <dict>
         <key>default</key>
-        <integer>3</integer>
+        <integer>4</integer>
     </dict>
 
     <key>Nickname Format</key>

Data/Templates/newMessagePostedWithSender.mustache

@@ -1,19 +1,22 @@
 
-<div 	ltype="{{lineType}}" 
+<div 
+	class="line {{lineClassAttribute}}"
+	id="line-{{lineNumber}}"
 
-{{^isRemoteMessage}}
-		mtype="{{nicknameType}}"
-{{/isRemoteMessage}}
+	data-command="{{command}}"
 
 {{#isEncrypted}}
-		encrypted="true"
+	data-encrypted="true"
 {{/isEncrypted}}
 
-		command="{{command}}"
-		highlight="{{highlightAttributeRepresentation}}" 
-		class="line {{lineClassAttributeRepresentation}}" 
-		id="line-{{lineNumber}}"
-		timestamp="{{timestamp}}">
+	data-highlight="{{highlightAttribute}}"
+	data-line-type="{{lineType}}"
+
+{{^isRemoteMessage}}
+	data-member-type="{{nicknameType}}"
+{{/isRemoteMessage}}
+
+	data-timestamp="{{timestamp}}">
 
 {{#isEncrypted}}
 	{{{encryptedMessageLockTemplate}}}
@@ -22,43 +25,29 @@
 	<span class="sender"
 		onclick="Textual.nicknameMaybeWasDoubleClicked(this)"
 		oncontextmenu="Textual.openStandardNicknameContextualMenu()"
-		mtype="{{nicknameType}}"
-		nickname="{{nickname}}"
+		data-member-type="{{nicknameType}}"
+		data-nickname="{{nickname}}"
+
 		{{#nicknameColorHashingEnabled}}
-			{{#nicknameColorHashingIsStyleBased}}
-				{{#nicknameColorStyleOverride}}
-					coloroverride="true"
-				{{/nicknameColorStyleOverride}}
+			{{#nicknameColorStyleOverride}}
+			data-override-color="true"
+			{{/nicknameColorStyleOverride}}
 
-				{{^ isEmpty(nicknameColorStyle) }}
-				style="color: {{nicknameColorStyle}};"
-				{{/ isEmpty(nicknameColorStyle) }}
-			{{^nicknameColorHashingIsStyleBased}}
-				colornumber="{{nicknameColorNumber}}"
-			{{/nicknameColorHashingIsStyleBased}}
+			{{^ isEmpty(nicknameColorStyle) }}
+			style="color: {{nicknameColorStyle}};"
+			{{/ isEmpty(nicknameColorStyle) }}
 		{{/nicknameColorHashingEnabled}}>{{formattedNickname}}</span>
-
-	<span class="message" ltype="{{lineType}}">{{{formattedMessage}}}
-
-		{{#inlineMediaAvailable}}
-			{{#inlineMediaArray}}
 
-			<span class="inlineImageCell" id="inlineImage-{{anchorInlineImageUniqueID}}" style="display: none;">
-				<span class="closeButton" href="#" onclick="Textual.toggleInlineImage('{{anchorInlineImageUniqueID}}', false);">×</span>
+	<span class="message">{{{formattedMessage}}}
 
-				<a href="{{anchorLink}}" onclick="return InlineImageLiveResize.negateAnchorOpen()">
-					<img src="{{imageURL}}" class="image" style="max-width: {{preferredMaximumWidth}}px;" />
-				</a>
-			</span>
-
-			{{/inlineMediaArray}}
-		{{/inlineMediaAvailable}}
-	</span>
+		{{#inlineMediaEnabled}}
+			<span class="inlineMediaContainer"></span>
+		{{/inlineMediaEnabled}}
+	</span>		
 
 	<span class="time"
 
-		{{^ isEmpty(localizedTimestamp) }}
-			title="{{localizedTimestamp}}"
-		{{/ isEmpty(localizedTimestamp) }}>{{formattedTimestamp}} </span>
-	</span>
+	{{^ isEmpty(localizedTimestamp) }}
+		title="{{localizedTimestamp}}"
+	{{/ isEmpty(localizedTimestamp) }}>{{formattedTimestamp}} </span>
 </div>

Data/Templates/newMessagePostedWithoutSender.mustache

@@ -1,22 +1,23 @@
 
-<div 	ltype="{{lineType}}" 
+<div
+	data-command="{{command}}"
+	data-line-type="{{lineType}}"
 
 {{^isRemoteMessage}}
-		mtype="{{nicknameType}}"
+	data-member-type="{{nicknameType}}"
 {{/isRemoteMessage}}
 
-		command="{{command}}"
-		class="line {{lineClassAttributeRepresentation}}" 
-		id="line-{{lineNumber}}"
-		timestamp="{{timestamp}}">
+	data-timestamp="{{timestamp}}"
+	class="line {{lineClassAttribute}}"
+	id="line-{{lineNumber}}">
 
 	<span class="sender"></span>
 
-	<span class="message" ltype="{{lineType}}">{{{formattedMessage}}}</span>
+	<span class="message">{{{formattedMessage}}}</span>
 
 	<span class="time"
 
 	{{^ isEmpty(localizedTimestamp) }}
-		title="{{localizedTimestamp}}"
+	title="{{localizedTimestamp}}"
 	{{/ isEmpty(localizedTimestamp) }}>{{formattedTimestamp}} </span>
 </div>

README.md

@@ -1,7 +1,7 @@
 Succinct Style for Textual
 ==========================
 
-Succinct is a [solarized dark](http://ethanschoonover.com/solarized) theme for the Textual IRC client based on the [Colloquy theme of the same name](https://github.com/TempSpas/succinct-for-colloquy). The code was built off of the [Sulaco](https://github.com/rgrove/textual-sulaco) dark theme. The theme is still in beta, so expect some kinks here and there.
+Succinct is a [Solarized dark](http://ethanschoonover.com/solarized) theme for the Textual IRC client based on the [Colloquy theme of the same name](https://github.com/TempSpas/succinct-for-colloquy). The code was built off of the [Sulaco](https://github.com/rgrove/textual-sulaco) dark theme. A light variant of the theme is available [here](https://github.com/TempSpas/SuccinctLight).
 
 ![Screenshot](/Screenshots/screenshot1.png?raw=true)
 
@@ -22,15 +22,14 @@ Succinct is a [solarized dark](http://ethanschoonover.com/solarized) theme for t
 
 ## Installing
 
-1. [Download the Succinct theme](https://github.com/TempSpas/textual-succinct/archive/master.zip)
+1. Download the Succinct theme by going to the [release page](https://github.com/TempSpas/textual-succinct/releases) and downloading the latest version of `SuccinctDark.zip`.
 
-2. Open Textual's preferences. Go to Addons->Installed Addons and click the
-   "Open in Finder" button next to the "Custom Addons Location" label.
+2. Open Textual's preferences. Go to `Addons`->`Installed Addons` and click the
+   `Open in Finder` button next to the `Custom Addons Location` label.
 
 3. Browse to Textual's `Styles` directory.
 
-4. Extract the Succinct theme here, into its own folder (rename it if you don't
-   like GitHub's autogenerated archive name).
+4. Extract the Succinct theme here, into its own folder.
 
 <!-- NOTE: The theme currently displays the full topic bar at all times. If you wish to have it display a shortened version that lengthens upon hovering, uncomment the lines marked at 576 and 584. -->
 
@@ -40,8 +39,6 @@ Succinct is a [solarized dark](http://ethanschoonover.com/solarized) theme for t
 
 * Finalize selected user colors.
 
-* Make changes to inline images. Should have a more uniform alignment pattern.
-
 ## License
 
 Copyright (c) 2017