Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: vertical bar broken in chart/gear acitivity (issue: #1646) #1673

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fix: vertical bar broken in chart/gear acitivity (issue: #1646) #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7833649
Fix: vertical bar broken in chart/gear acitivity
AdityaKrSingh26 Nov 21, 2024
df00e64
Fix: indentation and vertical broken lines in gear/chart activity
AdityaKrSingh26 Nov 22, 2024
c1d5f21
Fix: indentation in gear and chart activity
AdityaKrSingh26 Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion activities/Chart.activity/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<body oncontextmenu="return false;">
<div id="app" :class="{fullscreen: isFullscreen}">
<sugar-toolbar ref="SugarToolbar">
<div id="toolbar-left">
<sugar-toolitem ref="activityPal" id="activity-button"></sugar-toolitem>
<sugar-toolitem
ref="sharedPal"
Expand Down Expand Up @@ -56,10 +57,12 @@
@export-file="exportFile"
:title="l10n.stringExportSettings"
></sugar-toolitem>

</div>
<div id="toolbar-right">
<sugar-toolitem @click="onStop" id="stop-button" title="Stop" class="pull-right"></sugar-toolitem>
<sugar-toolitem @click="isFullscreen = !isFullscreen" id="fullscreen-button" class="pull-right" :title="l10n.stringFullscreen"></sugar-toolitem>
<sugar-toolitem @click="onHelp" id="help-button" :title="l10n.stringHelp" class="pull-right"></sugar-toolitem>
</div>
</sugar-toolbar>
<!-- Sub Toolbar -->
<div id="sub-toolbar" :class="{hidden: !configActive && !textPalActive}">
Expand Down
8 changes: 7 additions & 1 deletion activities/Chart.activity/lib/sugar-web/graphics/css/sugar-96dpi.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,22 @@ a {
height: 55px;
padding: 0 57px;
color: white;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #282828;
-webkit-user-select: none;
-moz-user-select: none;
}
#toolbar-left {
display: flex;
align-items: center;
}
/* Toolbar separator */
.toolbar hr {
display: inline-block;
height: 33px;
margin: 2.5px;
margin-bottom: -17px;
border: 1px solid #808080;
}
/* Toolbar toolbutton */
Expand Down
4 changes: 4 additions & 0 deletions activities/Gears.activity/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<body>
<div id="main-toolbar" class="toolbar">
<div id="toolbar-left">
<button class="toolbutton" id="activity-button" title="My Activity"></button>
<hr/>
<button class="toolbutton" id="gear-button" title="Gear"></button>
Expand All @@ -27,9 +28,12 @@
<button class="toolbutton play" id="play-button" title="Play"></button>
<hr/>
<button class="toolbutton" id="clear-button" title="Clear"></button>
</div>
<div id="toolbar-right">
<button class="toolbutton pull-right" id="stop-button" title="Stop"></button>
<button class="toolbutton pull-right" id="fullscreen-button" title="Fullscreen"></button>
<button class="toolbutton pull-right" id="help-button" title="Help"></button>
</div>
</div>
<div id="canvas">
<canvas id="gearsketch_canvas"></canvas>
Expand Down
8 changes: 7 additions & 1 deletion activities/Gears.activity/lib/sugar-web/graphics/css/sugar-96dpi.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,22 @@ a {
height: 55px;
padding: 0 57px;
color: white;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #282828;
-webkit-user-select: none;
-moz-user-select: none;
}
#toolbar-left {
display: flex;
align-items: center;
}
/* Toolbar separator */
.toolbar hr {
display: inline-block;
height: 33px;
margin: 2.5px;
margin-bottom: -17px;
border: 1px solid #808080;
}
/* Toolbar toolbutton */
Expand Down