Merge branch 'pr/1673' into dev

llaske · Dec 18, 2024 · a8202f4 · a8202f4
2 parents 18ab077 + 2fad758
commit a8202f4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Recording video doesn't work on Windows #1203
 - Activity Description opening downwards in Journal #1407
 - Listview Popup increasing page length and opening downwards for lower icons #1674
+- Vertical bar are broken in Chart/Gears activities on Windows #1646
 
 ## [1.8.0] - 2024-04-10
 ### Added

diff --git a/activities/Chart.activity/css/activity.css b/activities/Chart.activity/css/activity.css
@@ -570,6 +570,19 @@ p {
 	height: 100%;
 }
 
+/* Toolbar seprator */
+.seprator-line{
+	background-color: #808080;
+	background-position: center;
+	width: 2px;
+	margin-left: 5px;
+	margin-right: 4px;
+	margin-bottom: 4px;
+	height: 45px;
+	display: inline-block;
+	vertical-align: bottom;
+}
+
 @media (max-width: 800px) {
 	.activity-title {
 		margin: 0;

diff --git a/activities/Chart.activity/index.html b/activities/Chart.activity/index.html
@@ -33,19 +33,19 @@
 					v-if="SugarPresence"
 				></sugar-toolitem>
 
-				<hr />
+				<div class="seprator-line"></div>
 				<sugar-toolitem id="add-button" :title="l10n.stringAddValue" @click="addData"></sugar-toolitem>
 				<sugar-toolitem id="remove-button" :title="l10n.stringRemoveValue" @click="removeData"></sugar-toolitem>
 
-				<hr />
+				<div class="seprator-line"></div>
 				<template v-for="(string, key) in CHART_TYPES" :key="key">
 					<sugar-toolitem @click="setChartType(key)" :id="`${key}-chart-button`" :class="{active: pref.chartType==key}" :title="l10n[string]"></sugar-toolitem>
 				</template>
 				<sugar-toolitem id="csv-button" :class="{active: pref.chartType == 'csvMode'}"  @click="setChartType('csvMode')" :title=l10n.stringViewCsv></sugar-toolitem>
-				<hr />
+				<div class="seprator-line"></div>
 				<sugar-toolitem id="config-button" @click="toggleConfig" class="invoker" :class="{active: configActive}" :title="l10n.stringConfigs"></sugar-toolitem>
 				<sugar-toolitem id="text-palette-button" @click="toggleTextPal" class="invoker" :class="{active: textPalActive}" :title="l10n.stringConfigs"></sugar-toolitem>
-				<hr />
+				<div class="seprator-line"></div>
 				<sugar-toolitem 
 					id="export-button" 
 					ref="exportPal"

diff --git a/activities/Gears.activity/css/activity.css b/activities/Gears.activity/css/activity.css
@@ -57,6 +57,19 @@ body {
 	z-index: 5;
 }
 
+/* Toolbar seprator */
+.seprator-line{
+	background-color: #808080;
+	background-position: center;
+	width: 2px;
+	margin-left: 5px;
+	margin-right: 4px;
+	margin-bottom: 4px;
+	height: 45px;
+	display: inline-block;
+	vertical-align: bottom;
+}
+
 @media screen and (max-width: 567px) {
 	.toolbar {
 		padding-left: 10px;

diff --git a/activities/Gears.activity/index.html b/activities/Gears.activity/index.html
@@ -20,12 +20,12 @@
   <body>
     <div id="main-toolbar" class="toolbar">
       <button class="toolbutton" id="activity-button" title="My Activity"></button>
-      <hr/>
+      <div class="seprator-line"></div>
       <button class="toolbutton" id="gear-button" title="Gear"></button>
       <button class="toolbutton" id="chain-button" title="Chain"></button>
       <button class="toolbutton" id="momentum-button" title="Momentum"></button>
       <button class="toolbutton play" id="play-button" title="Play"></button>
-      <hr/>
+      <div class="seprator-line"></div>
       <button class="toolbutton" id="clear-button" title="Clear"></button>
       <button class="toolbutton pull-right" id="stop-button" title="Stop"></button>
       <button class="toolbutton pull-right" id="fullscreen-button" title="Fullscreen"></button>