Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ess-opis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
ics-software
ess-opis
Merge requests
!237
TS2 PSS Updates
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
TS2 PSS Updates
krisztianloki/ess-opis:ts2pss
into
master
Overview
0
Commits
2
Pipelines
0
Changes
4
Merged
Krisztián Löki
requested to merge
krisztianloki/ess-opis:ts2pss
into
master
4 years ago
Overview
0
Commits
2
Pipelines
0
Changes
4
Expand
Dear
@benjaminbertrand
, could you please merge this? Thanks!
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
c03d2ef9
2 commits,
4 years ago
4 files
+
67
−
30
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
NON-APPROVED/TS2/pss/embedded_displays/rad.bob
+
23
−
3
Options
@@ -31,17 +31,37 @@
</script>
</scripts>
</widget>
<widget
type=
"label"
version=
"2.0.0"
>
<name>
Label shadow
</name>
<text>
AGM-
$(AGM)
</text>
<x>
2
</x>
<y>
2
</y>
<width>
48
</width>
<height>
48
</height>
<font>
<font
name=
"SMALL-SANS-BOLD"
family=
"Source Sans Pro"
style=
"BOLD"
size=
"14.0"
>
</font>
</font>
<foreground_color>
<color
name=
"TEXT-DARK"
red=
"25"
green=
"25"
blue=
"25"
>
</color>
</foreground_color>
<horizontal_alignment>
1
</horizontal_alignment>
<vertical_alignment>
1
</vertical_alignment>
</widget>
<widget
type=
"label"
version=
"2.0.0"
>
<name>
Label
</name>
<text>
RM$(R_IDX)
</text>
<text>
AGM-
$(AGM)
</text>
<width>
50
</width>
<height>
50
</height>
<font>
<font
name=
"
Default Bold
"
family=
"Source Sans Pro"
style=
"BOLD"
size=
"1
6
.0"
>
<font
name=
"
SMALL-SANS-BOLD
"
family=
"Source Sans Pro"
style=
"BOLD"
size=
"1
4
.0"
>
</font>
</font>
<foreground_color>
<color
red=
"2
5
5"
green=
"2
5
5"
blue=
"25
5"
alpha=
"200
"
>
<color
red=
"2
4
5"
green=
"2
4
5"
blue=
"2
4
5"
>
</color>
</foreground_color>
<horizontal_alignment>
1
</horizontal_alignment>
Loading