diff options
Diffstat (limited to 'app/assets')
10 files changed, 8 insertions, 76 deletions
diff --git a/app/assets/javascripts/sidebar/queries/sidebar_details.query.graphql b/app/assets/javascripts/sidebar/queries/sidebar_details.query.graphql deleted file mode 100644 index 90d1a7794ea..00000000000 --- a/app/assets/javascripts/sidebar/queries/sidebar_details.query.graphql +++ /dev/null @@ -1,9 +0,0 @@ -query sidebarDetails($fullPath: ID!, $iid: String!) { - project(fullPath: $fullPath) { - id - issue(iid: $iid) { - id - iid - } - } -} diff --git a/app/assets/javascripts/sidebar/queries/sidebar_details_mr.query.graphql b/app/assets/javascripts/sidebar/queries/sidebar_details_mr.query.graphql deleted file mode 100644 index 0505f88773d..00000000000 --- a/app/assets/javascripts/sidebar/queries/sidebar_details_mr.query.graphql +++ /dev/null @@ -1,9 +0,0 @@ -query mergeRequestSidebarDetails($fullPath: ID!, $iid: String!) { - project(fullPath: $fullPath) { - id - mergeRequest(iid: $iid) { - id - iid # currently unused. - } - } -} diff --git a/app/assets/javascripts/sidebar/services/sidebar_service.js b/app/assets/javascripts/sidebar/services/sidebar_service.js index beacdeb559c..00d3177b75a 100644 --- a/app/assets/javascripts/sidebar/services/sidebar_service.js +++ b/app/assets/javascripts/sidebar/services/sidebar_service.js @@ -1,15 +1,8 @@ -import sidebarDetailsIssueQuery from 'ee_else_ce/sidebar/queries/sidebar_details.query.graphql'; import { TYPE_USER } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import createGqClient, { fetchPolicies } from '~/lib/graphql'; import axios from '~/lib/utils/axios_utils'; import reviewerRereviewMutation from '../queries/reviewer_rereview.mutation.graphql'; -import sidebarDetailsMRQuery from '../queries/sidebar_details_mr.query.graphql'; - -const queries = { - merge_request: sidebarDetailsMRQuery, - issue: sidebarDetailsIssueQuery, -}; export const gqClient = createGqClient( {}, @@ -36,37 +29,13 @@ export default class SidebarService { } get() { - return Promise.all([ - axios.get(this.endpoint), - gqClient.query({ - query: this.sidebarDetailsQuery(), - variables: { - fullPath: this.fullPath, - iid: this.iid.toString(), - }, - }), - ]); - } - - sidebarDetailsQuery() { - return queries[this.issuableType]; + return axios.get(this.endpoint); } update(key, data) { return axios.put(this.endpoint, { [key]: data }); } - updateWithGraphQl(mutation, variables) { - return gqClient.mutate({ - mutation, - variables: { - ...variables, - projectPath: this.fullPath, - iid: this.iid.toString(), - }, - }); - } - getProjectsAutocomplete(searchTerm) { return axios.get(this.projectsAutocompleteEndpoint, { params: { diff --git a/app/assets/javascripts/sidebar/sidebar_mediator.js b/app/assets/javascripts/sidebar/sidebar_mediator.js index 238960046a5..912f0fdcbef 100644 --- a/app/assets/javascripts/sidebar/sidebar_mediator.js +++ b/app/assets/javascripts/sidebar/sidebar_mediator.js @@ -93,8 +93,8 @@ export default class SidebarMediator { fetch() { return this.service .get() - .then(([restResponse, graphQlResponse]) => { - this.processFetchedData(restResponse.data, graphQlResponse.data); + .then(({ data }) => { + this.processFetchedData(data); }) .catch(() => createAlert({ diff --git a/app/assets/stylesheets/bootstrap_migration_reset.scss b/app/assets/stylesheets/bootstrap_migration_reset.scss index ad315c4ada1..fb112a2ee84 100644 --- a/app/assets/stylesheets/bootstrap_migration_reset.scss +++ b/app/assets/stylesheets/bootstrap_migration_reset.scss @@ -54,10 +54,6 @@ strong { font-weight: bold; } -a { - color: $blue-600; -} - hr { overflow: hidden; } diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 8a9113645b6..2c2d8a2b592 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -33,14 +33,6 @@ } } - a { - color: $blue-600; - - > code { - color: $blue-600; - } - } - .media-container { display: inline-flex; flex-direction: column; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index deb22519ba1..5a590d2393b 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -382,6 +382,8 @@ $gl-text-color-quaternary: #d6d6d6; $gl-text-color-inverted: $white; $gl-text-color-secondary-inverted: rgba($white, 0.85); $gl-text-color-disabled: $gray-400; +$link-color: $blue-500 !default; +$link-hover-color: $blue-500 !default; $gl-grayish-blue: #7f8fa4; $gl-header-color: #4c4e54; $gl-font-size-12: 12px; diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index ac3f2d342f4..32c3ce1ba8c 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -57,7 +57,7 @@ strong { font-weight: bolder; } a { - color: #007bff; + color: #428fdc; text-decoration: none; background-color: transparent; } @@ -569,9 +569,6 @@ html [type="button"], strong { font-weight: bold; } -a { - color: #63a6e9; -} svg { vertical-align: baseline; } diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index 24c6449168a..61a2ce8dd62 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -38,7 +38,7 @@ strong { font-weight: bolder; } a { - color: #007bff; + color: #1f75cb; text-decoration: none; background-color: transparent; } @@ -550,9 +550,6 @@ html [type="button"], strong { font-weight: bold; } -a { - color: #1068bf; -} svg { vertical-align: baseline; } diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss index 9b4e8a1c6bd..33e10b9bd62 100644 --- a/app/assets/stylesheets/startup/startup-signin.scss +++ b/app/assets/stylesheets/startup/startup-signin.scss @@ -41,7 +41,7 @@ p { margin-bottom: 1rem; } a { - color: #007bff; + color: #1f75cb; text-decoration: none; background-color: transparent; } @@ -595,9 +595,6 @@ h3 { margin-top: 20px; margin-bottom: 10px; } -a { - color: #1068bf; -} hr { overflow: hidden; } |